From 502c9fa9a84156ab8c7efd3549eba0c9c72d45e3 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Tue, 31 Dec 2024 15:45:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
index 434ac29..4790dfe 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
@@ -234,7 +234,7 @@
                 and b.xtlx = #{req.xtlx}
             </if>
         </where>
-        order by b.current_id desc
+        order by b.status asc
     </select>
     <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select *
@@ -458,7 +458,7 @@
             </if>
 
         </where>
-        order by b.mini_id desc
+        order by b.status asc
     </select>
     <select id="gzhZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
         select
@@ -485,7 +485,7 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        order by b.account_id desc
+        order by b.status asc
     </select>
     <select id="emailZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
         select
@@ -512,7 +512,7 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        order by b.email_id desc
+        order by b.status asc
     </select>
     <select id="appZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
 
@@ -541,7 +541,7 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        order by b.app_id desc
+        order by b.status asc
     </select>
     <select id="getByTaskId" resultType="com.ruoyi.tc.entity.AssetTask" parameterType="int">
         select * from asset_task where id=#{taskId}

From f7fe75c85529d94381593ab4a7ca490865e540bc Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Thu, 2 Jan 2025 14:05:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tc/controller/AssetTaskController.java    |  4 ++
 .../tc/entity/response/AssetdwHcResponse.java | 10 ++---
 .../main/resources/mapper/AssetTaskDao.xml    | 40 ++++++++++++++++---
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java
index 48bb4d3..e052349 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java
@@ -490,6 +490,10 @@ public class AssetTaskController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, AssetdwHcRequest req) {
         List<AssetdwHcResponse> list = assetTaskService.export(req);
+        list.forEach(x -> {
+            String formattedRatio = x.getCheckedRatio()  + "%";
+            x.setCheckedRatio(formattedRatio);
+        });
         ExcelUtil<AssetdwHcResponse> util = new ExcelUtil<AssetdwHcResponse>(AssetdwHcResponse.class);
         util.exportExcel(response, list, "单位完成情况");
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java
index 2bea316..bd72fd7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java
@@ -27,7 +27,7 @@ public class AssetdwHcResponse {
     /**
      * 核查资产数量
      */
-    @Excel(name = "单位名称")
+    @Excel(name = "核查资产数量")
     @ApiModelProperty("核查资产数量")
     private Integer total;
 
@@ -42,7 +42,7 @@ public class AssetdwHcResponse {
     /**
      * 完成状态
      */
-    @Excel(name = "完成状态",readConverterExp = "1=进行中,2=正常完成，3=超期完成")
+    @Excel(name = "完成状态",readConverterExp = "1=进行中,2=正常完成,3=超期完成")
     private Integer taskStatus;
 
 
@@ -58,8 +58,8 @@ public class AssetdwHcResponse {
     /**
      * 百分比
      */
-    @Excel(name = "百分比")
-    @ApiModelProperty("百分比")
-    private double checkedRatio;
+    @Excel(name = "完成比例")
+    @ApiModelProperty("完成比例")
+    private String checkedRatio;
 
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
index 4790dfe..92dc225 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
@@ -234,7 +234,13 @@
                 and b.xtlx = #{req.xtlx}
             </if>
         </where>
-        order by b.status asc
+        ORDER BY
+        CASE
+
+        WHEN b.STATUS = 1 THEN
+        0 ELSE 1
+        END,
+        b.STATUS ASC
     </select>
     <select id="findBytaskIdandAssestId" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select *
@@ -458,7 +464,13 @@
             </if>
 
         </where>
-        order by b.status asc
+        ORDER BY
+        CASE
+
+        WHEN b.STATUS = 1 THEN
+        0 ELSE 1
+        END,
+        b.STATUS ASC
     </select>
     <select id="gzhZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
         select
@@ -485,7 +497,13 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        order by b.status asc
+        ORDER BY
+        CASE
+
+        WHEN b.STATUS = 1 THEN
+        0 ELSE 1
+        END,
+        b.STATUS ASC
     </select>
     <select id="emailZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
         select
@@ -512,7 +530,13 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        order by b.status asc
+        ORDER BY
+        CASE
+
+        WHEN b.STATUS = 1 THEN
+        0 ELSE 1
+        END,
+        b.STATUS ASC
     </select>
     <select id="appZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
 
@@ -541,7 +565,13 @@
                 and b.status =#{req.status}
             </if>
         </where>
-        order by b.status asc
+        ORDER BY
+        CASE
+
+        WHEN b.STATUS = 1 THEN
+        0 ELSE 1
+        END,
+        b.STATUS ASC
     </select>
     <select id="getByTaskId" resultType="com.ruoyi.tc.entity.AssetTask" parameterType="int">
         select * from asset_task where id=#{taskId}