变更

CentralizedMonitoring/src/main/java/com/nmgs/workorder/mapper/WorkInfoMapper.java

@@ -1,22 +1,22 @@
-package com.nmgs.workorder.mapper;
+package com.nmgs.workorder.mapper;
-
+
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nmgs.workorder.entity.WorkInfo;
+import com.nmgs.workorder.entity.WorkInfo;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
-
+
-import java.util.Map;
+import java.util.Map;
-
+
-/**
+/**
- * @author: shuguang
+ * @author: shuguang
- * @date: 2023年11月07日 16:11
+ * @date: 2023年11月07日 16:11
- * @description:
+ * @description:
- */
+ */
-@Mapper
+@Mapper
-public interface WorkInfoMapper extends BaseMapper<WorkInfo> {
+public interface WorkInfoMapper extends BaseMapper<WorkInfo> {
-
+
-    Page<WorkInfo> myPageWorkInfo2(Page<?> page,@Param("ew") QueryWrapper<WorkInfo> queryWarper);
+    Page<WorkInfo> myPageWorkInfo2(Page<?> page,@Param("ew") QueryWrapper<WorkInfo> queryWarper);
-
+
-}
+}

CentralizedMonitoring/src/main/java/com/nmgs/workorder/mapper/WorkInfoMapper.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
+<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nmgs.workorder.mapper.WorkInfoMapper">
+<mapper namespace="com.nmgs.workorder.mapper.WorkInfoMapper">
-
+
-
+
-    <select id="myPageWorkInfo2" resultType="com.nmgs.workorder.entity.WorkInfo">
+    <select id="myPageWorkInfo2" resultType="com.nmgs.workorder.entity.WorkInfo">
-        SELECT u.*, o.feedbackCount FROM GD_WORKINFO u LEFT JOIN (SELECT WORKORDERNO, COUNT(*) as feedbackCount FROM
+        SELECT u.*, o.feedbackCount FROM GD_WORKINFO u LEFT JOIN (SELECT WORKORDERNO, COUNT(*) as feedbackCount FROM
-            GD_WORKFEEDBACK GROUP BY WORKORDERNO) o ON u.WORKORDERNO = o.WORKORDERNO
+            GD_WORKFEEDBACK GROUP BY WORKORDERNO) o ON u.WORKORDERNO = o.WORKORDERNO
-            ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
-        order by DT desc
+        order by DT desc
-    </select>
+    </select>
-</mapper>
+</mapper>

CentralizedMonitoring/src/main/java/com/nmgs/workorder/service/impl/WorkOrderServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nmgs.config.Constant;
-import com.nmgs.util.DESUtil;
 import com.nmgs.util.DateTimeUtil;
 import com.nmgs.util.FileUtil;
 import com.nmgs.util.PropertiesUtil;
@@ -37,7 +36,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;