草稿功能各个页面开发引起的查询bug，预告警单新增整改意见字段

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -35,14 +34,14 @@ public class QuitRunningDeviceParam  implements Serializable {
      * 设备编号
      */
     @ApiModelProperty(value = "设备编号")
-    @NotBlank(message = "设备编号不能为空")
+//    @NotBlank(message = "设备编号不能为空")
     private String deviceId;
 
     /**
      * 设备类型 1:装置；2:监测点
      */
     @ApiModelProperty(value = "设备类型")
-    @NotNull(message = "设备类型不能为空")
+//    @NotNull(message = "设备类型不能为空")
     private Integer deviceType;
 
     /**

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java

@@ -97,7 +97,7 @@ public class WarningLeafletParam implements Serializable{
          * 采取措施
          */
         @ApiModelProperty(value = "采取措施")
-        @NotBlank(message = "采取措施不能为空")
+//        @NotBlank(message = "采取措施不能为空")
         private String takeStep;
 
 
@@ -105,7 +105,7 @@ public class WarningLeafletParam implements Serializable{
          * 处理成效报告
          */
         @ApiModelProperty(value = "处理成效报告")
-        @NotBlank(message = "处理成效报告不能为空")
+//        @NotBlank(message = "处理成效报告不能为空")
         private String reportPath;
 
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java

@@ -23,7 +23,8 @@ public class UserReportNormalParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     private String id;
-
+    @ApiModelProperty(value = "保存1,提交审批2")
+    private String saveOrCheckflag;
     /**
      * 关联干扰源用户表
      */

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java

@@ -36,6 +36,7 @@ import com.njcn.user.api.UserFeignClient;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -72,10 +73,9 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
 //        checkQuitRunningDevice(quitRunningDeviceParam, false);
         QuitRunningDevice quitRunningDevice = new QuitRunningDevice();
         BeanUtils.copyProperties(quitRunningDeviceParam, quitRunningDevice);
-        //监测点只有退运，终端由前端选择了指定状态
+
-        if (quitRunningDevice.getDeviceType() == 2) {
+        quitRunningDevice.setDevStatus(quitRunningDeviceParam.getDevStatus());
-            quitRunningDevice.setDevStatus(4);
+
-        }
         quitRunningDevice.setState(DataStateEnum.ENABLE.getCode());
         //设置状态
         if(Objects.equals(quitRunningDeviceParam.getSaveOrCheckflag(),"1")){
@@ -167,7 +167,12 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
             if (Objects.nonNull(quitRunningDeviceQueryParam.getStatus())) {
                 quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.status", quitRunningDeviceQueryParam.getStatus());
             }
-            quitRunningDeviceVOQueryWrapper.in(CollUtil.isNotEmpty(mapDetail.keySet()),"supervision_quit_running_device.device_id", mapDetail.keySet());
+            quitRunningDeviceVOQueryWrapper.and(x->x
+                    .in(CollUtil.isNotEmpty(mapDetail.keySet()),"supervision_quit_running_device.device_id", mapDetail.keySet())
+                    .or()
+                    .isNull("supervision_quit_running_device.device_id")
+                    .or().eq("supervision_quit_running_device.device_id","")
+            );
         }
 
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
@@ -250,7 +255,9 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
         QuitRunningDevice quitRunningDevice = this.baseMapper.selectById(id);
         QuitRunningDeviceVO quitRunningDeviceVO = new QuitRunningDeviceVO();
         BeanUtils.copyProperties(quitRunningDevice, quitRunningDeviceVO);
+        if(StringUtils.isNotEmpty(quitRunningDeviceVO.getDeviceId())){
             if (quitRunningDeviceVO.getDeviceType() == 1) {
+
                 DeviceVO deviceVO = lineFeignClient.getDeviceDetailData(quitRunningDeviceVO.getDeviceId()).getData();
                 quitRunningDeviceVO.setDeviceName(deviceVO.getName());
                 quitRunningDeviceVO.setDeviceStatus(deviceVO.getRunFlag());
@@ -266,6 +273,8 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
                 quitRunningDeviceVO.setSubName(lineInfoVO.getSubName());
                 quitRunningDeviceVO.setVolName(lineInfoVO.getVolName());
             }
+        }
+
         return quitRunningDeviceVO;
     }
 

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

@@ -144,7 +144,14 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         WarningLeaflet warningLeaflet = this.baseMapper.selectById(warningLeafletUpdateParam.getId());
         warningLeaflet.setTakeStep(warningLeafletUpdateParam.getTakeStep());
         warningLeaflet.setReportPath(warningLeafletUpdateParam.getReportPath());
+        //设置状态
+        if(Objects.equals(warningLeafletUpdateParam.getSaveOrCheckflag(),"1")){
+            warningLeaflet.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
+
+        }else {
             warningLeaflet.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+
+        }
         if(Objects.equals(warningLeafletUpdateParam.getSaveOrCheckflag(),"2")) {
             // 发起 BPM 流程
             Map<String, Object> processInstanceVariables = new HashMap<>();

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java

@@ -14,22 +14,17 @@ import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.enums.SupervisionKeyEnum;
 import com.njcn.supervision.mapper.user.UserReportNormalMapper;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
-import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
-import com.njcn.supervision.pojo.vo.survey.SurveyPlanVO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.IUserReportNormalService;
 import com.njcn.supervision.service.user.UserReportPOService;
 import com.njcn.supervision.utils.InstanceUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
-import com.njcn.user.pojo.po.User;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
@@ -69,8 +64,15 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         UserReportNormalPO userReportNormalPO = new UserReportNormalPO();
         BeanUtil.copyProperties(userReportNormalParam, userReportNormalPO);
         userReportNormalPO.setState(DataStateEnum.ENABLE.getCode());
-        userReportNormalPO.setStatus(FlowStatusEnum.AUDIT.getCode());
+        if(Objects.equals(userReportNormalParam.getSaveOrCheckflag(),"1")){
-        this.save(userReportNormalPO);
+            userReportNormalPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
+
+        }else {
+            userReportNormalPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+
+        }
+        this.saveOrUpdate(userReportNormalPO);
+        if(Objects.equals(userReportNormalParam.getSaveOrCheckflag(),"2")){
             // 发起 BPM 流程
             Map<String, Object> processInstanceVariables = new HashMap<>();
             BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
@@ -87,6 +89,8 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
             // 将工作流的编号，更新到流程单中
             userReportNormalPO.setProcessInstanceId(processInstanceId);
             this.baseMapper.updateById(userReportNormalPO);
+        }
+
         return userReportNormalPO.getId();
     }