修改设备清洁度

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -114,7 +114,7 @@ public class TPssrCleaningController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
-                    }  else if (j == 2) {
+                    } else if (j == 2) {
                         entity.setDevType(cellValue);
                     }
                 }
@@ -275,7 +275,7 @@ public class TPssrCleaningController extends BaseController {
                 sheet.addMergedRegion(cellRangeAddress6);
                 sheet.addMergedRegion(cellRangeAddress7);
             }
-            filename = "PSSR_07_设备清洁"  + ".xlsx";
+            filename = "PSSR_07_设备清洁" + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -307,7 +307,7 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrCleaning tPssrCleaning) {
-        if (StringUtils.isNotEmpty(tPssrCleaning.getConfirm1())&&tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
+        if (StringUtils.isNotEmpty(tPssrCleaning.getConfirm1()) && tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
@@ -379,7 +379,12 @@ public class TPssrCleaningController extends BaseController {
         if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
-        tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
+        TPssrCleaning cleaning = tPssrCleaningService.selectTPssrCleaningById(tPssrCleaning.getId());
+        if (StringUtils.isEmpty(cleaning.getCheckContent())) {
+            tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
+        } else {
+            tPssrCleaning.setCheckContent(JSON.toJSONString(tPssrCleaning.getContentList()));
+        }
         tPssrFileService.updateFileRelevance(tPssrCleaning.getFileIds(), "sbqjd", tPssrCleaning.getId(), tPssrCleaning.getSubId());
         return toAjax(tPssrCleaningService.updateTPssrCleaning(tPssrCleaning));
     }