From bb9499352faae20bb2c898f3f6078f7a4e9ceef2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 19 四月 2024 10:17:19 +0800
Subject: [PATCH] 检验项目数据导入；检验模板调整
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java | 2
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 2
cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductUser.java | 4 +
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 63 ++++++++++++---------
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 2
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 39 +++++++++----
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml | 22 +++++++
9 files changed, 95 insertions(+), 43 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java
index 999f1e8..9fcddc7 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java
@@ -17,6 +17,8 @@
IPage<StandardMethod> selectStandardMethodList(Page page, QueryWrapper<StandardMethod> ew);
+ StandardMethod selectStandMethodById(Integer id);
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
index 3381c50..dd18705 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
@@ -49,7 +49,7 @@
private String name;
@ValueTableShow(2)
- @ApiModelProperty(value = "鏍囧噯鎻忚堪(鑻辨枃)")
+ @ApiModelProperty(value = "鏍囧噯鎻忚堪EN")
private String nameEn;
/**
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index 8f54984..4ce5560 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -29,13 +29,29 @@
@ApiModelProperty(value = "妫�楠岄」")
private String inspectionItem;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "妫�楠岄」EN")
+ private String inspectionItemEn;
+
// @ValueTableShow(2)
-// @ApiModelProperty(value = "妫�楠屽瓙椤�")
+// @ApiModelProperty(value = "妫�楠屽垎绫�")
// private String inspectionItemClassify;
@ValueTableShow(3)
- @ApiModelProperty(value = "妫�楠岄」瀛愰」")
+ @ApiModelProperty(value = "妫�楠屽瓙椤�")
private String inspectionItemSubclass;
+
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "妫�楠屽瓙椤笶N")
+ private String inspectionItemSubclassEn;
+
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "妫�楠屽璞�")
+ private Integer sample;
+
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "鍗曚环(鍏�)")
+ private BigDecimal price;
@ValueTableShow(4)
@ApiModelProperty(value = "瀹為獙瀹�")
@@ -46,16 +62,20 @@
private String sonLaboratory;
@ValueTableShow(5)
+ @ApiModelProperty(value = "瑕佹眰鎻忚堪")
+ private String askTell;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "瑕佹眰鍊�")
+ private String ask;
+
+ @ValueTableShow(5)
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
- @ValueTableShow(5)
+ @ValueTableShow(6)
@ApiModelProperty(value = "璇曢獙鏂规硶")
private String method;
-
- @ValueTableShow(6)
- @ApiModelProperty(value = "鍗曚环(鍏�)")
- private BigDecimal price;
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
@@ -77,7 +97,6 @@
@ApiModelProperty(value = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
- @ValueTableShow(10)
@ApiModelProperty(value = "璁惧缁�")
private String deviceGroup;
@@ -95,10 +114,6 @@
@ValueTableShow(13)
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
private String bsm;
-
- @ValueTableShow(5)
- @ApiModelProperty(value = "妫�楠屽璞�")
- private Integer sample;
@ValueTableShow(14)
@ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
index 2cc8edc..55785fe 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
@@ -66,7 +66,7 @@
@Override
public int upStandardMethod(StandardMethod standardMethod) {
int i = standardMethodMapper.updateById(standardMethod);
- standardTreeService.reTreeBySampleType(standardMethod.getSampleType());
+ standardTreeService.reTreeBySampleType(standardMethodMapper.selectStandMethodById(standardMethod.getId()).getSampleType());
return i;
}
}
diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
index 3689b41..b65d510 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -41,4 +41,26 @@
${ew.customSqlSegment}
</if>
</select>
+ <select id="selectStandMethodById" resultType="com.yuanchu.mom.pojo.StandardMethod">
+ select sm.id,
+ sm.code,
+ sm.name,
+ sm.structure_test_object_id,
+ sto.specimen_name sample_type,
+ sm.remark,
+ u1.name create_user_name,
+ sm.create_time,
+ u2.name update_user_name,
+ sm.update_time,
+ sm.is_product,
+ sm.field,
+ sm.name_en,
+ sm.is_use,
+ sm.qualification_id
+ from standard_method sm
+ left join user u1 on sm.create_user = u1.id
+ left join user u2 on sm.update_user = u2.id
+ left join structure_test_object sto on sm.structure_test_object_id = sto.id
+ where sm.id = #{id}
+ </select>
</mapper>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductUser.java
index 82c88e9..bca8c45 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductUser.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductUser.java
@@ -7,7 +7,9 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* 妫�楠岄」鐩殑浜哄憳妫�楠岃褰�
@@ -15,6 +17,8 @@
*/
@TableName(value ="ins_product_user")
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class InsProductUser implements Serializable {
/**
*
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 12d2730..b3eda3a 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
@@ -91,6 +91,9 @@
@Resource
private InsProductResultMapper insProductResultMapper;
+ @Resource
+ private InsProductUserMapper insProductUserMapper;
+
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
Map<String, Object> map = new HashMap<>();
@@ -144,7 +147,6 @@
public void saveInsContext(Map<String, Object> insContext) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
- AtomicInteger count = new AtomicInteger();
insContext.forEach((k, v) -> {
JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
InsProduct insProduct = new InsProduct();
@@ -154,7 +156,7 @@
result = new InsProductResult();
}
result.setInsProductId(Integer.parseInt(k));
- if(jo.get("insValue") != null){
+ if (jo.get("insValue") != null) {
JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
List<Map<String, Object>> iv = new ArrayList<>();
for (Object o : jsonArray) {
@@ -168,11 +170,12 @@
map.put("u", insValue.get("u"));
}
iv.add(map);
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
}
result.setInsValue(JSON.toJSONString(iv));
}
- if(jo.get("comValue") != null){
+ if (jo.get("comValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
List<Map<String, Object>> cv = new ArrayList<>();
for (Object o : jsonArray2) {
@@ -184,7 +187,7 @@
result.setComValue(JSON.toJSONString(cv));
}
JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
- if(resValue.get("v")!=null){
+ if (resValue.get("v") != null) {
insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
}
JSONObject equipValue = JSON.parseObject(JSON.toJSONString(jo.get("equipValue")));
@@ -206,11 +209,17 @@
}
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
- if (count.get() == 0) {
- InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
- insSample.setInsState(1);
- count.addAndGet(1);
+ insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
+ insSample.setInsState(1);
+ Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, insSample.getId()));
+ Long l1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, insSample.getId()).isNotNull(InsProduct::getInsResult));
+ if (l == l1) {
+ insSample.setInsState(2);
}
+ insSampleMapper.updateById(insSample);
});
return null;
}).thenAccept(res -> {
@@ -251,11 +260,11 @@
samples.forEach(a -> {
Set<String> templateSet = new HashSet<>();
getTemplateThing(set, map2, a);
- a.getInsProduct().forEach(b->{
- String[] split = b.getMethod().replaceAll("]", "").replaceAll("\\[","").replaceAll("\"","").split(",");
+ a.getInsProduct().forEach(b -> {
+ String[] split = b.getMethod().replaceAll("]", "").replaceAll("\\[", "").replaceAll("\"", "").split(",");
standardMethod.addAll(Arrays.asList(split));
- if(b.getInsProductResult()!=null){
- if(b.getInsProductResult().getEquipValue()!=null&& !Objects.equals(b.getInsProductResult().getEquipValue(), "")){
+ if (b.getInsProductResult() != null) {
+ if (b.getInsProductResult().getEquipValue() != null && !Objects.equals(b.getInsProductResult().getEquipValue(), "")) {
deviceSet.add(b.getInsProductResult().getEquipValue());
}
}
@@ -265,7 +274,7 @@
templateSet.add(JSON.toJSONString(b.getTemplate()));
});
AtomicInteger index = new AtomicInteger();
- templateSet.forEach(tem->{
+ templateSet.forEach(tem -> {
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
@@ -283,15 +292,15 @@
if ("妫�楠屽瓙椤�".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
int count2 = 0;
for (InsProduct p : a.getInsProduct()) {
- if(v.get("v").equals(p.getInspectionItemSubclass())){
- pMap.put(jo1.get("r")+"", p);
+ if (v.get("v").equals(p.getInspectionItemSubclass())) {
+ pMap.put(jo1.get("r") + "", p);
break;
- }else{
+ } else {
count2++;
}
}
- if(count2 == a.getInsProduct().size()){
- delRSet.add(jo1.get("r")+"");
+ if (count2 == a.getInsProduct().size()) {
+ delRSet.add(jo1.get("r") + "");
}
}
}
@@ -315,7 +324,7 @@
}
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
InsProduct p = pMap.get(jo1.get("r") + "");
- if (p!=null && v.get("ps") != null) {
+ if (p != null && v.get("ps") != null) {
String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
if (value.equals("瑕佹眰鍊�")) {
textRenderData.setText(p.getAsk());
@@ -350,7 +359,7 @@
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
- } else if (p==null && v.get("ps") != null) {
+ } else if (p == null && v.get("ps") != null) {
String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
p = pMap.get(pMap.keySet().iterator().next());
if (value.equals("鏈�缁堝��")) {
@@ -427,8 +436,8 @@
for (String s : standardMethod) {
standardMethod2.append("銆�").append(s);
}
- standardMethod2.replace(0, 1,"");
- tables.forEach(table->{
+ standardMethod2.replace(0, 1, "");
+ tables.forEach(table -> {
table.put("tableSize", tables.size() + 1);
});
List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
@@ -439,8 +448,8 @@
codeStr.put("鍙戞斁鏃ユ湡", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
String codePath;
try {
- codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{","")
- .replaceAll("}","").replaceAll(",","").replaceAll("\"",""), twoCode);
+ codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{", "")
+ .replaceAll("}", "").replaceAll(",", "").replaceAll("\"", ""), twoCode);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -491,8 +500,8 @@
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
-// int r = -1;
- /*if (BeanUtil.isNotEmpty(cellData)) {
+ /*int r = -1;
+ if (BeanUtil.isNotEmpty(cellData)) {
for (JSONObject o : cellData) {
JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
tableData.add(o);
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 5045af2..f5822aa 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -51,12 +51,12 @@
io.state = 1
AND io.ins_state != 5
and send_time is not null
+ and (isu.user_id = #{userId} OR isu.user_id is NULL)
GROUP BY
ip.son_laboratory,
io.id
) a
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
- where a.user_id = #{userId} OR a.user_id is NULL
ORDER BY
a.user_id DESC,
a.type DESC,
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 34c8d68..1efe402 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -103,6 +103,6 @@
select sm.code,sm.name,sm.remark from standard_method sm
left join structure_test_object sto on sm.structure_test_object_id = sto.id
where sto.specimen_name = #{sampleType}
- and is_product = 1
+ and is_use = 1
</select>
</mapper>
--
Gitblit v1.9.3