完善

platform-dao/src/main/java/com/platform/dao/dto/sb/SbMeasureLogDTO.java

@@ -35,6 +35,11 @@ public class SbMeasureLogDTO extends BaseDTO implements Serializable {
      */
     @Transient
     private String sbId;
+    /**
+     * 准确度等级
+     */
+    @Transient
+    private String fdjxh;
     /**
      * 设备id
      */

platform-dao/src/main/java/com/platform/dao/entity/sb/SbMeasureLog.java

@@ -79,6 +79,11 @@ public class SbMeasureLog implements Serializable {
      * 是否启用: 0-否 1-是
      */
     private Integer enable;
+    /**
+     * 准确度等级
+     */
+    @Transient
+    private String fdjxh;
     /**
      * 要求
      */

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -219,9 +219,8 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
      * 1：显示字段为true的进行显示
      * 2：有报修的都要显示
      * 3：红色：非计划性维修的设备
-     *   黄色：计划性维修的设备
-     *   蓝色：正常的设备
-     *
+     * 黄色：计划性维修的设备
+     * 蓝色：正常的设备
      *
      * @param model
      * @return
@@ -735,6 +734,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
     /**
      * 保存维保手册
+     *
      * @param model
      */
     private void saveRecheckFile(SbInfoDTO model) {
@@ -826,14 +826,16 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             }
 
             // 自定义参数
-            if(StringUtils.isNotBlank(sbInfo.getParamList()) && sbInfo.getParamList() != ""){
+            if (StringUtils.isNotBlank(sbInfo.getParamList()) && sbInfo.getParamList() != "") {
                 JSONArray jsonArray = JSONArray.parseArray(sbInfo.getParamList());
                 StringBuffer sBuffer = new StringBuffer();
-                for(int i = 0; i < jsonArray.size(); i++) {
-                    JSONObject obj = jsonArray.getJSONObject(i);
-                    String name = (String) obj.get("name");
-                    String content = (String) obj.get("content");
-                    sBuffer.append("名称：" + name + ",内容：" + content + ";");
+                if (jsonArray != null) {
+                    for (int i = 0; i < jsonArray.size(); i++) {
+                        JSONObject obj = jsonArray.getJSONObject(i);
+                        String name = (String) obj.get("name");
+                        String content = (String) obj.get("content");
+                        sBuffer.append("名称：" + name + ",内容：" + content + ";");
+                    }
                 }
                 sbInfo.setParamList(sBuffer.toString());
             }
@@ -1637,7 +1639,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     LocalDateTime now = LocalDateTime.now();
                     for (SbInfoVO item : items) {
 
-                        boolean findPosition= false;
+                        boolean findPosition = false;
                         for (SbPosition position : positionList) {
                             if (position.getName().equalsIgnoreCase(item.getPositionName())) {
                                 item.setPositionId(position.getId());

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -107,6 +107,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod).minusDays(1));
         sbInfo.setZaiz(model.getName());// 检定单位
         sbInfo.setSbdh(model.getNo());// 检定编号
+        sbInfo.setRemark(model.getRemark());// 备注
         sbInfo.setDph(model.getRequirement());// 检定人
         sbInfo.setStatus(model.getSbStatus());// 每次检定后，状态变更也要更新
         sbInfoMeasureMapper.updateByPrimaryKey(sbInfo);
@@ -139,6 +140,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod).minusDays(1));
         sbInfo.setZaiz(model.getName());// 检定单位
         sbInfo.setSbdh(model.getNo());// 检定编号
+        sbInfo.setRemark(model.getRemark());// 备注
         sbInfo.setDph(model.getRequirement());// 检定人
         sbInfo.setStatus(model.getSbStatus());// 每次检定后，状态变更也要更新
         sbInfoMeasureMapper.updateByPrimaryKey(sbInfo);
@@ -196,6 +198,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         checkStandard.setCheckPeriod(sbInfo.getCheckPeriod());
         checkStandard.setCheckDate(sbInfo.getCheckDate());
         checkStandard.setNextCheckDate(sbInfo.getNextCheckDate());
+        checkStandard.setFdjxh(sbInfo.getFdjxh());
         checkStandard.setSbStatus(sbInfo.getStatus());
         Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
         weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, checkStandard.getId());