From 1fe60de0b826d028c5798de86ec055be45684220 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 09:48:03 +0800
Subject: [PATCH] 委托编号格式变更+下单查询检验项目+报告的设备日期+检验下单的样品数量不准确+检验的检验进度计算
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 2
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 11 +++--
performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java | 12 ++----
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 29 +++++++++-----
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 3 +
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 6 +++
8 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index b5a37cc..648812a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -37,6 +37,12 @@
return Result.success(standardTreeService.selectStandardTreeList());
}
+ @ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)")
+ @GetMapping("/selectStandardTreeList2")
+ public Result selectStandardTreeList2() {
+ return Result.success(standardTreeService.selectStandardTreeList());
+ }
+
@ValueClassify("鏍囧噯搴�")
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index c2720da..e1c2351 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -276,9 +276,9 @@
List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
InsProductResult result;
if (CollectionUtils.isEmpty(results)) {
- result = new InsProductResult();
+ result = new InsProductResult();
} else {
- result = results.get(0);
+ result = results.get(0);
}
result.setInsProductId(Integer.parseInt(k));
if (jo.get("insValue") != null) {
@@ -638,6 +638,13 @@
break;
}
} else if (value.equals("搴忓彿")) {
+ /*if (i == 0 ){
+ index.getAndIncrement();
+ }else if (pMap.get(temp.get(i-1).get("r") + "")!= null && JSON.parseObject(JSON.toJSONString(temp.get(i-1).get("v"))).get("ps") != null){
+ if (pMap.get(temp.get(i-1).get("")).getInspectionItem()!=p.getInspectionItem()) {
+ index.getAndIncrement();
+ }
+ }*/
index.getAndIncrement();
textRenderData.setText(index + "");
} else if (value.equals("璁＄畻鍊�")) {
@@ -654,12 +661,12 @@
} else if (value.equals("璇曢獙鏂规硶")) {
textRenderData.setText(p.getMethodS());
} else if (value.equals("妫�楠岄」")) {
- textRenderData.setText(p.getInspectionItem() + "\n" + p.getInspectionItemEn());
+ textRenderData.setText(p.getInspectionItem() + "\r\n" + p.getInspectionItemEn());
} else if (value.equals("妫�楠屽瓙椤�")) {
if (ObjectUtils.isEmpty(p.getInspectionItemSubclassEn())) {
textRenderData.setText(p.getInspectionItemSubclass());
} else {
- textRenderData.setText(p.getInspectionItemSubclass() + "\n" + p.getInspectionItemSubclassEn());
+ textRenderData.setText(p.getInspectionItemSubclass() + "\r\n" + p.getInspectionItemSubclassEn());
}
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
@@ -862,7 +869,7 @@
//绗竴琛�
if (j == 0) {
//绗竴鍒�
- textRenderData.setText("绠¤壊鏍嘰nPipe鈭�100");
+ textRenderData.setText("绠¤壊鏍嘝ipe鈭�100");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -870,7 +877,7 @@
cells.add(cellRenderData);
} else if (j == 1) {
//绗簩鍒�
- textRenderData.setText("鍏夌氦鑹叉爣\nScanning Number鈭�101");
+ textRenderData.setText("鍏夌氦鑹叉爣\r\nScanning Number鈭�101");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -878,7 +885,7 @@
cells.add(cellRenderData);
} else {
//椤圭洰淇℃伅
- textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
+ textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\r\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -889,7 +896,7 @@
//鏈夌埗瀛愰」鐩叧绯荤殑绗笁琛�
if (j == 0) {
//绗竴鍒�
- textRenderData.setText("绠¤壊鏍嘰nPipe鈭�100");
+ textRenderData.setText("绠¤壊鏍嘰r\nPipe鈭�100");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -897,7 +904,7 @@
cells.add(cellRenderData);
} else if (j == 1) {
//绗簩鍒�
- textRenderData.setText("鍏夌氦鑹叉爣\nScanning Number鈭�101");
+ textRenderData.setText("鍏夌氦鑹叉爣\r\nScanning Number鈭�101");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -907,9 +914,9 @@
//椤圭洰淇℃伅
//鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
if (insProducts1.get((int) (j - 2)).getInspectionItemSubclass().equals("") || insProducts1.get((int) (j - 2)).getInspectionItemSubclass() == null) {
- textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
+ textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\r\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
} else {
- textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\n\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
+ textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\r\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
}
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 2796bb7..6e42544 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -267,7 +267,8 @@
if (StringUtils.isEmpty(code)) {
code = "";
}
- insOrder.setEntrustCode(giveCode.giveCode("JC/" + code + "-", "ins_order", "", "yyMMdd"));
+ String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
+ insOrder.setEntrustCode(giveCode.giveCode("JC/ZX" + code + "-" + code2 + "-", "ins_order", "", "yyMM"));
return insOrderMapper.updateById(insOrder);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index c38f1a6..9656584 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -67,7 +67,7 @@
return null;
}
String[] split = insSample.getFactory().split(" - ");
- String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3];
+ String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
/* list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
.eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index 6c587dc..abb8e7f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -264,7 +264,6 @@
try {
str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
} catch (Exception e) {
- Console.log("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"");
str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
}
if (str.getStructureItemParameterId() == null) {
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 59724f5..ced1149 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -96,10 +96,10 @@
ir.url,
ir.url_s,
(select count(*) from ins_sample isa2
- where isa2.ins_order_id = io.id) sample_num,
- concat(ROUND((select count(*) from ins_order_state ios
- where ins_state = 5 and ios.ins_order_id = io.id) / (select count(*) from ins_order_state ios2
- where ios2.ins_order_id = io.id) * 100, 2), '%') insProgress,
+ where isa2.ins_order_id = io.id and isa2.sample_code NOT REGEXP '/' ) sample_num,
+ concat(ROUND((select count(*) from ins_product ip
+ where state = 1 and ins_result is not null and ip.ins_sample_id in (select id from ins_sample where ins_sample.ins_order_id= io.id )) / (select count(*) from ins_product ip2
+ where state = 1 and ip2.ins_sample_id in (select id from ins_sample where ins_sample.ins_order_id= io.id )) * 100, 2), '%') insProgress,
group_concat(distinct isa.sample_code,' ') sample_code,
group_concat(distinct isa.sample,' ') sample_name,
group_concat(distinct isa.model,' ') sample_model,
@@ -170,7 +170,8 @@
</select>
<select id="selectDeviceList" resultType="java.util.Map">
select device_name,specification_model,management_number,<!--DATE_ADD(date_format(last_calibration_date,
- '%Y-%m-%d'),INTERVAL calibration_date month)--> next_calibration_date latest_traceability
+ '%Y-%m-%d'),INTERVAL calibration_date month)--> date_format(next_calibration_date,'%Y-%m-%d')
+ latest_traceability
from device
where device.management_number in
<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index a1570ab..932e582 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -78,7 +78,7 @@
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
- and tree like concat('%', #{tree},'%')
+ and tree =#{tree}
order by case when man_hour_group is NULL then 1
when man_hour_group ='' then 1 else 0 end,
CASE
diff --git a/performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java b/performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java
index 8c53d08..9739fe1 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java
@@ -4,6 +4,8 @@
import com.alibaba.excel.write.metadata.style.WriteFont;
import org.apache.poi.ss.usermodel.*;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
public class StyleYearUtils {
@@ -86,13 +88,7 @@
}
public static void main(String[] args) {
- ArrayList<Integer> list = null;
- ArrayList<Integer> list11 = new ArrayList<>();
- list11.add(1);
- list11.add(1);
- list11.add(2);
- list11.add(2);
- list.addAll(list11);
- System.out.println(list);
+ String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM"));
+ System.out.println(date2);
}
}
--
Gitblit v1.9.3