微调

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java

@@ -109,7 +109,7 @@ public class BpmModelController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新建模型")
-    @ApiImplicitParam(name = "createRetVO", value = "模型数据", required = true)
+    @ApiImplicitParam(name = "bpmModelParam", value = "模型数据", required = true)
     public HttpResult<String> createModel(@Validated @RequestBody BpmModelParam bpmModelParam) {
         String methodDescribe = getMethodDescribe("createModel");
         String modelId = modelService.createModel(bpmModelParam, null);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/leaflet/mapping/WarningLeafletMapper.xml

@@ -49,7 +49,8 @@
                supervision_warning_leaflet.create_by,
                supervision_warning_leaflet.create_time,
                supervision_warning_leaflet.update_by,
-               supervision_warning_leaflet.update_time
+               supervision_warning_leaflet.update_time,
+               supervision_warning_leaflet.file_path
         FROM supervision_warning_leaflet supervision_warning_leaflet
         WHERE ${ew.sqlSegment}
     </select>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java

@@ -211,19 +211,21 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     public WarningLeafletVO getVOById(String id) {
         WarningLeaflet warningLeaflet = this.getById(id);
         WarningLeafletVO warningLeafletVO = new WarningLeafletVO();
-        BeanUtil.copyProperties(warningLeaflet, warningLeafletVO);
-        if (StrUtil.isNotBlank(warningLeaflet.getDeptId())) {
-            Dept dept = deptFeignClient.getDeptById(warningLeaflet.getDeptId()).getData();
-            if (Objects.nonNull(dept)) {
-                warningLeafletVO.setDeptName(dept.getName());
+        if (!Objects.isNull(warningLeaflet)){
+            BeanUtil.copyProperties(warningLeaflet, warningLeafletVO);
+            if (StrUtil.isNotBlank(warningLeaflet.getDeptId())) {
+                Dept dept = deptFeignClient.getDeptById(warningLeaflet.getDeptId()).getData();
+                if (Objects.nonNull(dept)) {
+                    warningLeafletVO.setDeptName(dept.getName());
+                }
+            }
+            if (warningLeaflet.getProblemType().equals(ProblemTypeEnum.SITE_TEST.getCode())) {
+                String problemId = warningLeaflet.getProblemId();
+                //查询谐波普测，获取该普测计划上传的文件
+                //查询到现场测试超标附件地址
+                SurveyTest surveyTest = surveyTestService.getById(problemId);
+                warningLeafletVO.setProblemPath(surveyTest.getTestReport());
             }
-        }
-        if (warningLeaflet.getProblemType().equals(ProblemTypeEnum.SITE_TEST.getCode())) {
-            String problemId = warningLeaflet.getProblemId();
-            //查询谐波普测，获取该普测计划上传的文件
-            //查询到现场测试超标附件地址
-            SurveyTest surveyTest = surveyTestService.getById(problemId);
-            warningLeafletVO.setProblemPath(surveyTest.getTestReport());
         }
         return warningLeafletVO;
     }
@@ -237,18 +239,20 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         WarningLeafletVO warningLeafletVO = this.getVOById(businessId);
-        bpmInstanceInfo.setHistoryInstanceId(warningLeafletVO.getHistoryInstanceId());
-        String type = "告警单";
-        if(warningLeafletVO.getLeafletType() == 1){
-            type = "预警单";
+        if (Objects.nonNull(warningLeafletVO.getId())) {
+            bpmInstanceInfo.setHistoryInstanceId(warningLeafletVO.getHistoryInstanceId());
+            String type = "告警单";
+            if(warningLeafletVO.getLeafletType() == 1){
+                type = "预警单";
+            }
+            String sign = "问题来源于".concat(ProblemTypeEnum.getNameByCode(warningLeafletVO.getProblemType()))
+                    .concat(",由单位")
+                    .concat(StrUtil.isBlank(warningLeafletVO.getDeptName())?"":warningLeafletVO.getDeptName())
+                    .concat("负责的")
+                    .concat(warningLeafletVO.getLeafletName())
+                    .concat(type);
+            bpmInstanceInfo.setInstanceSign(sign);
         }
-        String sign = "问题来源于".concat(ProblemTypeEnum.getNameByCode(warningLeafletVO.getProblemType()))
-                .concat(",由单位")
-                .concat(StrUtil.isBlank(warningLeafletVO.getDeptName())?"":warningLeafletVO.getDeptName())
-                .concat("负责的")
-                .concat(warningLeafletVO.getLeafletName())
-                .concat(type);
-        bpmInstanceInfo.setInstanceSign(sign);
         return bpmInstanceInfo;
     }
 
@@ -291,6 +295,9 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
                 if (deptMap.containsKey(record.getDutyOrgId())) {
                     record.setDutyOrgName(deptMap.get(record.getDutyOrgId()));
                 }
+                if (!Objects.isNull(record.getFilePath())){
+                    record.setFilePath(fileStorageUtil.getFileUrl(record.getFilePath()));
+                }
             }
         }
         return warningLeafletVOPage;