一周问题列表加状态条件

src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -61,8 +61,9 @@ public class PlatProjectCheckController extends BaseController {
      * 近一周问题列表
      */
     @GetMapping("/getIssueListLastWeek/{appOrg}")
-    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false, name = "day") Date day) {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, day));
+    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false, name = "day") Date day,
+                                           @RequestParam(required = false, name = "status") Integer status) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, day, status));
     }
 
     /**

src/main/java/com/project/zcustom/mapper/unit/LargeIssueMapper.java

@@ -75,7 +75,7 @@ public interface LargeIssueMapper extends BaseMapper<LargeIssue>
 
     public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg);
+    public List<LargeIssue> getIssueListLastWeek(@Param("appOrg") String appOrg,@Param("status")Integer status);
 
-    public List<LargeIssue> getIssueList(String appOrg, Date date);
+    public List<LargeIssue> getIssueList(@Param("appOrg")String appOrg,@Param("date") Date date,@Param("status")Integer status);
 }

src/main/java/com/project/zcustom/service/unit/ILargeIssueService.java

@@ -94,7 +94,7 @@ public interface ILargeIssueService extends IService<LargeIssue> {
 
     public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date);
+    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date,Integer status);
 
     public List<LargeIssue> selectList(LargeIssue largeIssue);
     public LargeIssue selectLargeIssueById(Long id);

src/main/java/com/project/zcustom/service/unit/impl/LargeIssueServiceImpl.java

@@ -179,11 +179,11 @@ public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIs
         return largeIssueMapper.getOverIssueNum(appOrg);
     }
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date){
+    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date,Integer status){
         if (date == null){
-            return largeIssueMapper.getIssueListLastWeek(appOrg);
+            return largeIssueMapper.getIssueListLastWeek(appOrg,status);
         }
-        else return largeIssueMapper.getIssueList(appOrg, date);
+        else return largeIssueMapper.getIssueList(appOrg, date,status);
     }
 
 

src/main/resources/mapper/zcustom/basics/PlatAppOrgMapper.xml

@@ -42,8 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             c.del_flag = 0
         <if test="appOrg != '0000'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
-        GROUP BY
-            c.id
+        GROUP BY  c.id order by cameraNum desc
     </select>
 
     <select id="getConnectUnitNum" resultType="int">

src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -147,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DATE( a.create_time ) BETWEEN DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND CURDATE()
         )
         <if test="appOrg != '0000'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="status != null">AND a.status = #{status}</if>
         order by a.create_time desc
     </select>
 
@@ -166,10 +167,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND b.del_flag = 0
         AND c.del_flag = '0'
         AND (
-        DATE( a.create_time ) BETWEEN DATE( #{arg1} )
+        DATE( a.create_time ) BETWEEN DATE( #{date} )
         AND CURDATE()
         )
-        <if test="arg0 != '0000'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
+        <if test="appOrg != '0000'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="status != null">AND a.status = #{status}</if>
         order by a.create_time desc
     </select>
 </mapper>