From 386af6fd927464760ed1d69a1a23d41bc91b1941 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 17 四月 2024 18:12:47 +0800
Subject: [PATCH] 调整模板功能
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 5 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 3 +
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java | 40 ++++++++++++++------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 52 +++++++++++++++-----------
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml | 6 ++
5 files changed, 70 insertions(+), 36 deletions(-)
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 d099dc5..3381c50 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
@@ -25,6 +25,15 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ValueTableShow(value = 1, name = "棰嗗煙")
+ private String field;
+
+ private Integer structureTestObjectId;
+
+ @ValueTableShow(2)
+ @ApiModelProperty("妫�楠屽璞�")
+ private String sampleType;
+
/**
* 鏍囧噯缂栧彿
*/
@@ -39,11 +48,9 @@
@ApiModelProperty(value = "鏍囧噯鎻忚堪")
private String name;
- private Integer structureTestObjectId;
-
- @ValueTableShow(3)
- @ApiModelProperty("妫�楠屽璞�")
- private String sampleType;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "鏍囧噯鎻忚堪(鑻辨枃)")
+ private String nameEn;
/**
* 澶囨敞
@@ -51,6 +58,18 @@
@ValueTableShow(3)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "璧勮川")
+ private String qualificationId;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鏄惁浜у搧鏍囧噯")
+ private Integer isProduct;
+
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "鏄惁鍚敤")
+ private Integer isUse;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -60,27 +79,24 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(4)
+ @ValueTableShow(7)
@ApiModelProperty(value = "鍒涘缓浜�")
private String createUserName;
- @ValueTableShow(6)
+ @ValueTableShow(9)
@ApiModelProperty(value = "鏇存柊浜�")
private String updateUserName;
- @ValueTableShow(5)
+ @ValueTableShow(8)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ValueTableShow(7)
+ @ValueTableShow(10)
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ValueTableShow(3)
- @ApiModelProperty(value = "鏄惁浜у搧鏍囧噯")
- private Integer isProduct;
}
\ No newline at end of file
diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
index 1dfd0d1..3689b41 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -27,7 +27,11 @@
sm.create_time,
u2.name update_user_name,
sm.update_time,
- sm.is_product
+ 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
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index d784a0a..9950112 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -168,4 +168,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime insTime;
+ @ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�")
+ private String tell;
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index a833fc9..820d6b9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -114,9 +114,12 @@
/**
* 鏂规硶
*/
- @ApiModelProperty("鏂规硶")
+ @ApiModelProperty("鏂规硶鍒楄〃")
private String method;
+ @ApiModelProperty("鏂规硶")
+ private String methodS;
+
/**
* 棰勮鏃堕棿(澶�)
*/
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 08ed607..12d2730 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
@@ -154,31 +154,39 @@
result = new InsProductResult();
}
result.setInsProductId(Integer.parseInt(k));
- JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
- List<Map<String, Object>> iv = new ArrayList<>();
- for (Object o : jsonArray) {
- JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
- Map<String, Object> map = new HashMap<>();
- map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
- if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
- map.put("u", userId);
- } else {
- map.put("u", insValue.get("u"));
+ 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) {
+ JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
+ try {
+ if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
+ map.put("u", userId);
+ } else {
+ map.put("u", insValue.get("u"));
+ }
+ iv.add(map);
+ }catch (Exception e){}
}
- iv.add(map);
+ result.setInsValue(JSON.toJSONString(iv));
}
- result.setInsValue(JSON.toJSONString(iv));
- JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
- List<Map<String, Object>> cv = new ArrayList<>();
- for (Object o : jsonArray2) {
- JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
- Map<String, Object> map = new HashMap<>();
- map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
- cv.add(map);
+ 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) {
+ JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
+ cv.add(map);
+ }
+ result.setComValue(JSON.toJSONString(cv));
}
- result.setComValue(JSON.toJSONString(cv));
JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
- insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
+ 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")));
try {
result.setEquipValue(JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v") + "");
@@ -483,7 +491,7 @@
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
- int r = -1;
+// int r = -1;
/*if (BeanUtil.isNotEmpty(cellData)) {
for (JSONObject o : cellData) {
JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
--
Gitblit v1.9.3