资产修改

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java

@@ -38,7 +38,19 @@ public class AssetdwHcResponse {
     @Excel(name = "完成数量")
     @ApiModelProperty("完成数量")
     private Integer checked;
+    /**
+     * 待核查
+     */
+    @Excel(name = "待核查")
+    @ApiModelProperty("待核查")
+    private Integer notChecked;
 
+    /**
+     * 待审批
+     */
+    @Excel(name = "待审批")
+    @ApiModelProperty("待审批")
+    private Integer dsp;
     /**
      * 完成状态
      */

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -250,6 +250,8 @@
         b.task_deadline,
         SUM(s.total) AS total,
         SUM(s.checked) AS checked,
+        SUM( s.notChecked ) AS notChecked,
+        SUM( s.dsp ) AS dsp,
         COALESCE(SUM(s.returned), 0) AS shthcs,
         ROUND(
         CASE
@@ -288,6 +290,7 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
@@ -311,6 +314,7 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
@@ -334,6 +338,7 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
@@ -355,6 +360,7 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
@@ -378,6 +384,7 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM