工作流程审核不通过、预告警单处理、终端周期检测等需求

1、提交了主pom，因为需要引入达梦数据量；
2、提交了gateway的配置文件，因为部分接口没有添加到权限中，待后续增加后再注释

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/CheckDeviceMapper.java

@@ -7,6 +7,8 @@ import com.njcn.supervision.pojo.po.device.CheckDevice;
 import com.njcn.supervision.pojo.vo.device.CheckDeviceVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 终端周期检测表 Mapper 接口
@@ -21,4 +23,5 @@ public interface CheckDeviceMapper extends MppBaseMapper<CheckDevice> {
 
     CheckDeviceVo getInfo(@Param("id") String id);
 
+    List<CheckDeviceVo> selectVOList(@Param("ew")QueryWrapper<CheckDeviceVo> queryWrapper);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/CheckDeviceMapper.xml

@@ -35,4 +35,24 @@
         where A.Id = #{id}
     </select>
 
+
+    <select id="selectVOList" resultType="CheckDeviceVo">
+        select
+        A.*,
+        B.Name deviceName,
+        B1.Name substation,
+        B2.Name dept,
+        C.This_Time_Check thisTimeCheck,
+        C.Next_Time_Check nextTimeCheck
+        from
+        supervision_check_device A
+        left join pq_line B on A.device_id = B.Id
+        left join pq_line B1 on B.Pid = B1.Id
+        left join pq_line B2 on B1.Pid = B2.Id
+        left join pq_device C on A.device_id = C.Id
+        <where>
+            and ${ew.sqlSegment}
+        </where>
+    </select>
+
 </mapper>

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

@@ -7,6 +7,8 @@ import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet;
 import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 预告警单表 Mapper 接口
@@ -20,4 +22,6 @@ public interface WarningLeafletMapper extends BaseMapper<WarningLeaflet> {
     Page<WarningLeafletVO> warningPageData(Page<Object> objectPage, @Param("ew") QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper);
 
     Page<WarningLeafletVO> alarmPageData(Page<Object> objectPage, @Param("ew") QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper);
+
+    List<WarningLeafletVO> getTodoBusiness(@Param("ew")QueryWrapper<WarningLeafletVO> queryWrapper);
 }

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

@@ -55,4 +55,30 @@
         WHERE ${ew.sqlSegment}
     </select>
 
+    <select id="getTodoBusiness" resultType="WarningLeafletVO">
+        SELECT
+            supervision_warning_leaflet.leaflet_name,
+            supervision_warning_leaflet.leaflet_no,
+            supervision_warning_leaflet.problem_type,
+            supervision_warning_leaflet.problem_id,
+            supervision_warning_leaflet.dept_id  as duty_Org_Id,
+            supervision_warning_leaflet.leaflet_type,
+            supervision_warning_leaflet.STATUS,
+            supervision_warning_leaflet.id,
+            supervision_warning_leaflet.process_instance_id,
+            supervision_warning_leaflet.history_instance_id,
+            supervision_warning_leaflet.issue_detail,
+            supervision_warning_leaflet.reform_advice,
+            supervision_warning_leaflet.take_step,
+            supervision_warning_leaflet.report_path,
+            supervision_warning_leaflet.state,
+            supervision_warning_leaflet.create_by,
+            supervision_warning_leaflet.create_time,
+            supervision_warning_leaflet.update_by,
+            supervision_warning_leaflet.update_time,
+            supervision_warning_leaflet.file_path
+        FROM supervision_warning_leaflet supervision_warning_leaflet
+        WHERE ${ew.sqlSegment}
+    </select>
+
 </mapper>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportPOMapper.java

@@ -19,4 +19,6 @@ public interface UserReportPOMapper extends BaseMapper<UserReportPO> {
     Page<UserReportVO> page(@Param("page")Page<Object> objectPage, @Param("ew") QueryWrapper<UserReportVO> userReportVOQueryWrapper);
 
     Page<UserReportVO> pageUpdate(@Param("page")Page<Object> objectPage, @Param("ew") QueryWrapper<UserReportVO> userReportVOQueryWrapper);
+
+    UserReportVO getUserReportById(@Param("ew")QueryWrapper<UserReportVO> userReportVOQueryWrapper);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml

@@ -86,4 +86,32 @@
     LEFT JOIN supervision_user_report_renewal r ON supervision_user_report.id=r.id
     WHERE ${ew.sqlSegment}
   </select>
+
+  <!--获取流程表单分页列表-->
+  <select id="getUserReportById" resultType="UserReportVO">
+    SELECT
+      supervision_user_report.id,
+      supervision_user_report.report_date,
+      supervision_user_report.org_id,
+      supervision_user_report.expected_production_date,
+      supervision_user_report.user_type,
+      supervision_user_report.city,
+      supervision_user_report.responsible_department,
+      supervision_user_report.user_status,
+      supervision_user_report.substation,
+      supervision_user_report.voltage_level,
+      supervision_user_report.project_name,
+      supervision_user_report.evaluation_dept,
+      supervision_user_report.data_type,
+      supervision_user_report.evaluation_conclusion,
+      supervision_user_report.process_instance_id,
+      supervision_user_report.history_instance_id,
+      supervision_user_report.create_time,
+      supervision_user_report.create_by,
+      supervision_user_report.status,
+      supervision_user_report.dev_id,
+      supervision_user_report.line_id
+    FROM supervision_user_report supervision_user_report
+    WHERE ${ew.sqlSegment}
+  </select>
 </mapper>