微调

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,6 +211,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     public WarningLeafletVO getVOById(String id) {
         WarningLeaflet warningLeaflet = this.getById(id);
         WarningLeafletVO warningLeafletVO = new WarningLeafletVO();
+        if (!Objects.isNull(warningLeaflet)){
             BeanUtil.copyProperties(warningLeaflet, warningLeafletVO);
             if (StrUtil.isNotBlank(warningLeaflet.getDeptId())) {
                 Dept dept = deptFeignClient.getDeptById(warningLeaflet.getDeptId()).getData();
@@ -225,6 +226,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
                 SurveyTest surveyTest = surveyTestService.getById(problemId);
                 warningLeafletVO.setProblemPath(surveyTest.getTestReport());
             }
+        }
         return warningLeafletVO;
     }
 
@@ -237,6 +239,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     public BpmInstanceInfo getInstanceInfo(String businessId) {
         BpmInstanceInfo bpmInstanceInfo = new BpmInstanceInfo();
         WarningLeafletVO warningLeafletVO = this.getVOById(businessId);
+        if (Objects.nonNull(warningLeafletVO.getId())) {
             bpmInstanceInfo.setHistoryInstanceId(warningLeafletVO.getHistoryInstanceId());
             String type = "告警单";
             if(warningLeafletVO.getLeafletType() == 1){
@@ -249,6 +252,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
                     .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;