From 57eac8c0b461f0fc8e9b23fd99bd9f0623212645 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Mon, 27 Apr 2026 17:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E8=80=97=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/EfficiencyTaskMapper.xml           |  42 ++-
 .../mapper/EfficiencyTaskReportMapper.xml     |  16 +-
 .../mapper/EfficiencyTempMapper.xml           |  10 +
 .../mapper/SalaryStandardMapper.xml           |  24 +-
 .../pojo/dto/BsEfficiencyTaskDTO.java         |   9 +
 .../pojo/dto/BsSalaryCalculationDTO.java      |   8 +
 .../pojo/vo/BsEfficiencyTaskReportVO.java     |   9 +
 .../pojo/vo/BsEfficiencyTaskVO.java           |   9 +
 .../pojo/vo/BsEfficiencyTempVO.java           |   9 +
 .../pojo/vo/BsSalaryCalculationVO.java        |   9 +
 .../pojo/vo/BsSalaryStandardVO.java           |  10 +-
 .../impl/BsEfficiencyTempServiceImpl.java     |   8 +-
 .../energy/mapper/EnergyCoreUseMapper.xml     |  10 +
 .../energy/mapper/EnergyMonitorMapper.xml     |  10 +
 .../desk/energy/mapper/EnergyQuotaMapper.xml  |  10 +
 .../desk/energy/mapper/EnergyTargetMapper.xml |  12 +-
 .../energy/mapper/PeakFlatValleyMapper.xml    |  10 +
 .../energy/pojo/vo/BsEnergyCoreUseVO.java     |   9 +
 .../energy/pojo/vo/BsEnergyMonitorVO.java     |   9 +
 .../desk/energy/pojo/vo/BsEnergyQuotaVO.java  |  10 +
 .../desk/energy/pojo/vo/BsEnergyTargetVO.java |   9 +
 .../energy/pojo/vo/BsPeakFlatValleyVO.java    |   9 +
 .../desk/produce/mapper/WorkPlanMapper.xml    | 271 +++++++++---------
 23 files changed, 376 insertions(+), 156 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml
index 996db1f5..1391f680 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml
@@ -24,11 +24,11 @@
 
     <select id="selectBsEfficiencyTaskPage" resultMap="bsEfficiencyTaskResultMap">
         SELECT  t.*,
-                bu.real_name as reportUserName,
-                bu1.real_name as createUserName,
-                case when t.status = '1' then '进行中' when t.status = '2' then '已完成' when t.status = '3' then '待审批' when t.status = '4' then '审批通过' when t.status = '5' then '审批不通过' when t.status = '6' then '已超期' when t.status = '7' then '任务失败'  else '' end as statusName,
-                ba.link as attachLink,
-                ba.original_name as attackName
+        bu.real_name as reportUserName,
+        bu1.real_name as createUserName,
+        case when t.status = '1' then '进行中' when t.status = '2' then '已完成' when t.status = '3' then '待审批' when t.status = '4' then '审批通过' when t.status = '5' then '审批不通过' when t.status = '6' then '已超期' when t.status = '7' then '任务失败'  else '' end as statusName,
+        ba.link as attachLink,
+        ba.original_name as attackName
         FROM BS_EFFICIENCY_TASK t
         LEFT JOIN BLADE_USER bu ON t.report_user = bu.id
         LEFT JOIN BLADE_USER bu1 ON t.create_user = bu1.id
@@ -57,16 +57,25 @@
                 AND bu2.real_name LIKE concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%')))
             </if>
         </where>
-        ORDER BY t.year_month desc, t.create_time
+        <choose>
+            <when test="bsEfficiencyTask.orderByField != null and bsEfficiencyTask.orderByField != ''">
+                ORDER BY ${bsEfficiencyTask.orderByField}
+                <if test="bsEfficiencyTask.isAsc">ASC</if>
+                <if test="!bsEfficiencyTask.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY t.year_month desc, t.create_time
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectBsEfficiencyTaskList" resultMap="bsEfficiencyTaskResultMap">
         SELECT  t.*,
-                bu.real_name as reportUserName,
-                bu1.real_name as createUserName,
-                case when t.status = '1' then '进行中' when t.status = '2' then '已完成' when t.status = '3' then '待审批' when t.status = '4' then '审批通过' when t.status = '5' then '审批不通过' when t.status = '6' then '已超期' when t.status = '7' then '任务失败'  else '' end as statusName,
-                ba.link as attachLink,
-                ba.original_name as attackName
+        bu.real_name as reportUserName,
+        bu1.real_name as createUserName,
+        case when t.status = '1' then '进行中' when t.status = '2' then '已完成' when t.status = '3' then '待审批' when t.status = '4' then '审批通过' when t.status = '5' then '审批不通过' when t.status = '6' then '已超期' when t.status = '7' then '任务失败'  else '' end as statusName,
+        ba.link as attachLink,
+        ba.original_name as attackName
         FROM BS_EFFICIENCY_TASK t
         LEFT JOIN BLADE_USER bu ON t.report_user = bu.id
         LEFT JOIN BLADE_USER bu1 ON t.create_user = bu1.id
@@ -92,7 +101,16 @@
                 and t.status = #{status}
             </if>
         </where>
-        ORDER BY t.year_month desc, t.create_time
+        <choose>
+            <when test="orderByField != null and orderByField != ''">
+                ORDER BY ${orderByField}
+                <if test="isAsc">ASC</if>
+                <if test="!isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY t.year_month desc, t.create_time
+            </otherwise>
+        </choose>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml
index e06978b7..f0014099 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml
@@ -20,6 +20,7 @@
     </resultMap>
 
     <select id="selectBsEfficiencyTaskReportPage" resultMap="bsEfficiencyTaskReportResultMap">
+        SELECT * FROM (
         SELECT
         tr.EMPLOYEE_CODE,
         tr.EMPLOYEE_NAME,
@@ -50,13 +51,22 @@
         </where>
         GROUP BY
         tr.EMPLOYEE_CODE, tr.EMPLOYEE_NAME, SUBSTR(t.year_month,1,4)
-        ORDER BY
-        SUBSTR(t.year_month,1,4) desc, tr.EMPLOYEE_CODE
+        )
+        <choose>
+            <when test="bsEfficiencyTaskReport.orderByField != null and bsEfficiencyTaskReport.orderByField != ''">
+                ORDER BY ${bsEfficiencyTaskReport.orderByField}
+                <if test="bsEfficiencyTaskReport.isAsc">ASC</if>
+                <if test="!bsEfficiencyTaskReport.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY year desc, EMPLOYEE_CODE
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectBsEfficiencyTaskReportList" resultMap="bsEfficiencyTaskReportResultMap">
         SELECT
-            tr.*
+        tr.*
         FROM
         BS_EFFICIENCY_TASK_REPORT tr
         INNER JOIN BS_EFFICIENCY_TASK t ON tr.TASK_ID = t.ID
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTempMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTempMapper.xml
index c032eeb5..19996669 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTempMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTempMapper.xml
@@ -23,6 +23,16 @@
         <where>
             t.is_deleted = 0
         </where>
+        <choose>
+            <when test="bsEfficiencyTemp.orderByField != null and bsEfficiencyTemp.orderByField != ''">
+                ORDER BY ${bsEfficiencyTemp.orderByField}
+                <if test="bsEfficiencyTemp.isAsc">ASC</if>
+                <if test="!bsEfficiencyTemp.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY t.CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml
index 7f4c8487..7e37c0b0 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/SalaryStandardMapper.xml
@@ -26,6 +26,7 @@
     </resultMap>
 
     <select id="selectBsSalaryStandardPage" resultMap="bsSalaryStandardResultMap">
+        SELECT * FROM (
         WITH STEP_DATA AS (
         SELECT
         t.ID,
@@ -49,12 +50,12 @@
         ps.NAME as PROCESS_NAME
         FROM BS_SALARY_STANDARD t
         LEFT JOIN BS_PROCESS_SET ps ON t.PROCESS_ID = ps.ID and ps.is_deleted = 0
-            <where>
-                t.is_deleted = 0
-                <if test="bsSalaryStandard.processName!=null">
-                    and ps.name like concat(concat('%', #{bsSalaryStandard.processName}),'%')
-                </if>
-            </where>
+        <where>
+            t.is_deleted = 0
+            <if test="bsSalaryStandard.processName!=null">
+                and ps.name like concat(concat('%', #{bsSalaryStandard.processName}),'%')
+            </if>
+        </where>
         ),
         STEP_NUMBERS AS ( SELECT LEVEL AS n FROM DUAL CONNECT BY LEVEL  <![CDATA[ <= ]]> 100 ) SELECT
         ID,
@@ -146,6 +147,17 @@
         ORDER BY
         ID,
         minStep NULLS FIRST
+        )
+        <choose>
+            <when test="bsSalaryStandard.orderByField != null and bsSalaryStandard.orderByField != ''">
+                ORDER BY ${bsSalaryStandard.orderByField}
+                <if test="bsSalaryStandard.isAsc">ASC</if>
+                <if test="!bsSalaryStandard.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME desc
+            </otherwise>
+        </choose>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java
index cfda2365..47257fc6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsEfficiencyTaskDTO.java
@@ -26,4 +26,13 @@ public class BsEfficiencyTaskDTO extends BsEfficiencyTaskEntity {
      * 精确匹配姓名
      */
     private String employeeNameExact;
+
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java
index 433a3096..f3b71137 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/dto/BsSalaryCalculationDTO.java
@@ -99,5 +99,13 @@ public class BsSalaryCalculationDTO {
      */
     private String maxTotalArea;
 
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java
index 0e7f23d8..3088a1b9 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskReportVO.java
@@ -67,5 +67,14 @@ public class BsEfficiencyTaskReportVO extends BsEfficiencyTaskReportEntity {
      */
     private BigDecimal m12Score;
 
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
+
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java
index aa425295..616864ab 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTaskVO.java
@@ -50,4 +50,13 @@ public class BsEfficiencyTaskVO extends BsEfficiencyTaskEntity {
      * 动态列表
      */
     private Map<String, Object> table;
+
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java
index 384ac6ad..821b68a5 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsEfficiencyTempVO.java
@@ -23,4 +23,13 @@ public class BsEfficiencyTempVO extends BsEfficiencyTempEntity {
      */
     private String updateUserName;
 
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java
index 5a31d07c..99153f22 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryCalculationVO.java
@@ -160,4 +160,13 @@ public class BsSalaryCalculationVO {
      */
     private String totalAmount;
 
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java
index 061f0ce4..d2c6f194 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/pojo/vo/BsSalaryStandardVO.java
@@ -34,5 +34,13 @@ public class BsSalaryStandardVO extends BsSalaryStandardEntity {
      */
     private BigDecimal price;
 
-    
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java
index f3a5b53c..65432f79 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java
@@ -57,7 +57,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
             mainTask.setYearMonth(yearMonth);
             mainTask.setTaskName(taskPrefix + "绩效");
             mainTask.setType("1");
-            mainTask.setReportTime(new Date());
+//            mainTask.setReportTime(new Date());
             mainTask.setParentId(0L);
             bsEfficiencyTaskService.save(mainTask);
         } else {
@@ -80,7 +80,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
         subTask.setTaskName(taskPrefix + bsEfficiencyTemp.getTaskName());
         subTask.setType("2");
         subTask.setReportUser(bsEfficiencyTemp.getReportUser());
-        subTask.setReportTime(new Date());
+//        subTask.setReportTime(new Date());
         subTask.setTempId(bsEfficiencyTemp.getId());
         subTask.setParentId(mainTask.getId());
         bsEfficiencyTaskService.save(subTask);
@@ -104,7 +104,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
             mainTask.setYearMonth(yearMonth);
             mainTask.setTaskName(taskPrefix + "绩效");
             mainTask.setType("1");
-            mainTask.setReportTime(new Date());
+//            mainTask.setReportTime(new Date());
             mainTask.setParentId(0L);
             bsEfficiencyTaskService.save(mainTask);
         } else {
@@ -122,7 +122,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
             subTask.setTaskName(taskPrefix + bsEfficiencyTemp.getTaskName());
             subTask.setType("2");
             subTask.setReportUser(bsEfficiencyTemp.getReportUser());
-            subTask.setReportTime(new Date());
+//            subTask.setReportTime(new Date());
             subTask.setTempId(bsEfficiencyTemp.getId());
             subTask.setParentId(mainTask.getId());
             bsEfficiencyTaskService.save(subTask);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyCoreUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyCoreUseMapper.xml
index f16fdaf7..978d7bb8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyCoreUseMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyCoreUseMapper.xml
@@ -54,6 +54,16 @@
                 )
             </if>
         </where>
+        <choose>
+            <when test="bsEnergyCoreUse.orderByField != null and bsEnergyCoreUse.orderByField != ''">
+                ORDER BY ${bsEnergyCoreUse.orderByField}
+                <if test="bsEnergyCoreUse.isAsc">ASC</if>
+                <if test="!bsEnergyCoreUse.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml
index dddc63f0..f1de27fc 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyMonitorMapper.xml
@@ -38,6 +38,16 @@
                 and month = #{bsEnergyMonitor.month}
             </if>
         </where>
+        <choose>
+            <when test="bsEnergyMonitor.orderByField != null and bsEnergyMonitor.orderByField != ''">
+                ORDER BY ${bsEnergyMonitor.orderByField}
+                <if test="bsEnergyMonitor.isAsc">ASC</if>
+                <if test="!bsEnergyMonitor.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml
index ef932baa..c2df722e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyQuotaMapper.xml
@@ -49,6 +49,16 @@
                 and "DATE" <![CDATA[ <= ]]> #{bsEnergyQuota.endDate}
             </if>
         </where>
+        <choose>
+            <when test="bsEnergyQuota.orderByField != null and bsEnergyQuota.orderByField != ''">
+                ORDER BY ${bsEnergyQuota.orderByField}
+                <if test="bsEnergyQuota.isAsc">ASC</if>
+                <if test="!bsEnergyQuota.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml
index 3ef61635..88a1bd18 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml
@@ -7,7 +7,7 @@
         <result column="ID" property="id"/>
         <result column="TYPE" property="type"/>
         <result column="MONTH" property="month"/>
-<!--        <result column="DATE" property="date"/>-->
+        <!--        <result column="DATE" property="date"/>-->
         <result column="TARGET" property="target"/>
         <result column="CREATE_USER" property="createUser"/>
         <result column="CREATE_DEPT" property="createDept"/>
@@ -37,6 +37,16 @@
                 and status = #{bsEnergyTarget.status}
             </if>
         </where>
+        <choose>
+            <when test="bsEnergyTarget.orderByField != null and bsEnergyTarget.orderByField != ''">
+                ORDER BY ${bsEnergyTarget.orderByField}
+                <if test="bsEnergyTarget.isAsc">ASC</if>
+                <if test="!bsEnergyTarget.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml
index 94dad978..1f8fcc0a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/PeakFlatValleyMapper.xml
@@ -38,6 +38,16 @@
                 and MONTH = #{bsPeakFlatValley.month}
             </if>
         </where>
+        <choose>
+            <when test="bsPeakFlatValley.orderByField != null and bsPeakFlatValley.orderByField != ''">
+                ORDER BY ${bsPeakFlatValley.orderByField}
+                <if test="bsPeakFlatValley.isAsc">ASC</if>
+                <if test="!bsPeakFlatValley.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java
index d8fd97c4..5c293c83 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyCoreUseVO.java
@@ -38,4 +38,13 @@ public class BsEnergyCoreUseVO extends BsEnergyCoreUseEntity {
     @Schema(description = "日期")
     private String date;
 
+    /**
+     * 排序字段
+     */
+    private String orderByField;
+    /**
+     *  true: 升序，false: 降序
+     */
+    private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java
index a2515293..6bbb05be 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyMonitorVO.java
@@ -42,4 +42,13 @@ public class BsEnergyMonitorVO extends BsEnergyMonitorEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 排序字段
+	 */
+	private String orderByField;
+	/**
+	 *  true: 升序，false: 降序
+	 */
+	private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java
index 3d622b04..ba7ceec3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyQuotaVO.java
@@ -52,4 +52,14 @@ public class BsEnergyQuotaVO extends BsEnergyQuotaEntity {
 	 */
 	private String endDate;
 
+	/**
+	 * 排序字段
+	 */
+	private String orderByField;
+	/**
+	 *  true: 升序，false: 降序
+	 */
+	private boolean isAsc;
+
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java
index 7487e039..39414a3b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEnergyTargetVO.java
@@ -42,4 +42,13 @@ public class BsEnergyTargetVO extends BsEnergyTargetEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 排序字段
+	 */
+	private String orderByField;
+	/**
+	 *  true: 升序，false: 降序
+	 */
+	private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java
index 4cfeab8d..96656a82 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsPeakFlatValleyVO.java
@@ -42,4 +42,13 @@ public class BsPeakFlatValleyVO extends BsPeakFlatValleyEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 排序字段
+	 */
+	private String orderByField;
+	/**
+	 *  true: 升序，false: 降序
+	 */
+	private boolean isAsc;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index 7198f9c4..f75f5709 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -59,7 +59,7 @@
 
     <select id="listPrByWpId" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
         select b.* from MES_QC_PRODUCE_RUN b
-                   where b.MTN_CODE in (select a.MTN_CODE from MES_MAC_TOOL_USE a where a.WP_ID =#{wpId} )
+        where b.MTN_CODE in (select a.MTN_CODE from MES_MAC_TOOL_USE a where a.WP_ID =#{wpId} )
     </select>
 
     <select id="getBoxInfo" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
@@ -68,61 +68,61 @@
         from MES_QC_PRODUCE_RUN c where c.mtn_code in (
             select a.mtn_code from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
             where b.CATEGORYS = '烘箱设备' and a.WP_ID = #{wpId}
-            )
-         and c.WORK_SLOT = '烘箱' order by c.IN_DATE desc
+        )
+                                    and c.WORK_SLOT = '烘箱' order by c.IN_DATE desc
     </select>
 
     <select id="listSlotInfoGr" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
-               a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
-                  select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
-                  sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
-                  from MES_MAC_TOOL_USE a
-                  inner join MES_WORK_PLAN b on a.WP_ID = b.ID
-                  inner join MES_WORK_ORDER c on b.WO_ID = c.ID
-                  inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                  inner join DS_PART f on d.PART_CODE = f.PART_CODE
-                  where a.MTN_CODE in (
-                      select a.MTN_CODE from MES_MAC_TOOL_USE a
-                      left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
-                      where a.WP_ID = #{wpId}
-
-                      <if test="aTrue==true">
-                        and b.CATEGORYS = '产线设备'
-                      </if>
-                  )
-                  and a.mtu_index = '1' and b.pps_id = 417
-                ) a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
-                             a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
+        a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
+        select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
+        sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
+        from MES_MAC_TOOL_USE a
+        inner join MES_WORK_PLAN b on a.WP_ID = b.ID
+        inner join MES_WORK_ORDER c on b.WO_ID = c.ID
+        inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
+        inner join DS_PART f on d.PART_CODE = f.PART_CODE
+        where a.MTN_CODE in (
+        select a.MTN_CODE from MES_MAC_TOOL_USE a
+        left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
+        where a.WP_ID = #{wpId}
+
+        <if test="aTrue==true">
+            and b.CATEGORYS = '产线设备'
+        </if>
+        )
+        and a.mtu_index = '1' and b.pps_id = 417
+        ) a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
+        a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
     </select>
 
 
     <select id="listSlotInfoList" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
-               a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
-                   select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
-                   sum(b.WORK_QTY*d.YP_AREA) over() as sumArea, a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
-                   from MES_MAC_TOOL_USE a
-                    inner join MES_WORK_PLAN b on a.WP_ID = b.ID
-                    inner join MES_WORK_ORDER c on b.WO_ID = c.ID
-                    inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                    inner join DS_PART f on d.PART_CODE = f.PART_CODE
-                    where a.MTN_CODE in (
-                    select a.MTN_CODE from MES_MAC_TOOL_USE a
-                    left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
-                    where a.WP_ID = #{wpId}
-
-                    <if test="aTrue==true">
-                        and b.CATEGORYS = '产线设备'
-                    </if>
-                    ) and a.mtu_index = '2' and a.BS_FEI_BA_SET is not null
-                   )a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
-                               a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
+        a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
+        select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
+        sum(b.WORK_QTY*d.YP_AREA) over() as sumArea, a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type
+        from MES_MAC_TOOL_USE a
+        inner join MES_WORK_PLAN b on a.WP_ID = b.ID
+        inner join MES_WORK_ORDER c on b.WO_ID = c.ID
+        inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
+        inner join DS_PART f on d.PART_CODE = f.PART_CODE
+        where a.MTN_CODE in (
+        select a.MTN_CODE from MES_MAC_TOOL_USE a
+        left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
+        where a.WP_ID = #{wpId}
+
+        <if test="aTrue==true">
+            and b.CATEGORYS = '产线设备'
+        </if>
+        ) and a.mtu_index = '2' and a.BS_FEI_BA_SET is not null
+        )a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
+        a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
     </select>
 
     <select id="listMacToolUse" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select * from MES_MAC_TOOL_USE a
-                 where a.wp_id= #{wpId}
+        where a.wp_id= #{wpId}
         <if test="aTrue==true">
             and  a.finished = false
         </if>
@@ -149,7 +149,7 @@
 
     <select id="getByPartCodeAndSubCodeMes" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartSub">
         select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a inner join DS_PART_BASICS b
-            on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
+                                                                                   on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
     </select>
 
     <select id="findByPartCodeAndMemoMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
@@ -163,15 +163,15 @@
     <select id="getQcReviewSheetListMes" resultType="org.springblade.desk.quality.pojo.entity.ReviewSheet">
         select a.rs_code,a.memo,a.unqualified_qty,a.REVIEW_DATE from QA_REVIEW_SHEET a
 --                inner join rb_pr_work_check b on a.wc_id = b.wc_id
-               inner join MES_WORK_PLAN c on a.wp_id=c.id
-               inner join MES_WORK_ORDER d on c.wo_id=d.id
-               inner join MES_YIELD_ORDER e on e.id = d.yo_id
-                where e.part_code = #{partCode} and e.batch_no = #{batchNo}
+                                                                         inner join MES_WORK_PLAN c on a.wp_id=c.id
+                                                                         inner join MES_WORK_ORDER d on c.wo_id=d.id
+                                                                         inner join MES_YIELD_ORDER e on e.id = d.yo_id
+        where e.part_code = #{partCode} and e.batch_no = #{batchNo}
     </select>
 
     <select id="listByWpiIdMes" resultType="org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail">
         select *,b.ITEM_NAME as trialItem,b.STANDARD_NAME as trialStandard,b.ID as wpiId from QA_WORK_PLAN_ITEM_DETAIL a
-            inner join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
+                                                                                                  inner join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
         order by a.UPDATE_TIME,a.GAUGE_VALUE1 desc
     </select>
 
@@ -201,26 +201,26 @@
     <select id="listSjSlotInfoMes" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.area, a.sumArea as totalArea,a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
         from (
-                 select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
-                        sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,
-                         a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
-                         inner join MES_WORK_PLAN b on a.WP_ID = b.ID
-                         inner join MES_WORK_ORDER c on b.WO_ID = c.ID
-                         inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                         inner join DS_PART f on d.part_code = f.part_code
-                        where a.MTN_CODE in(
-                            select a.MTN_CODE from MES_MAC_TOOL_USE a
-                            left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
-                            where a.WP_ID = #{wpId}
-                            <if test="aTrue==true">
-                                and b.CATEGORYS = '产线设备'
-                            </if>
-                            <if test="aTrue==false">
-                                and (b.CATEGORYS not like '%烘箱%' or b.CATEGORYS is null )
-                            </if>
-                        ) and a.mtu_index = '2'
-             )a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
-                a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
+        select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area,
+        sum(b.WORK_QTY*d.YP_AREA) over() as sumArea,
+        a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
+        inner join MES_WORK_PLAN b on a.WP_ID = b.ID
+        inner join MES_WORK_ORDER c on b.WO_ID = c.ID
+        inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
+        inner join DS_PART f on d.part_code = f.part_code
+        where a.MTN_CODE in(
+        select a.MTN_CODE from MES_MAC_TOOL_USE a
+        left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
+        where a.WP_ID = #{wpId}
+        <if test="aTrue==true">
+            and b.CATEGORYS = '产线设备'
+        </if>
+        <if test="aTrue==false">
+            and (b.CATEGORYS not like '%烘箱%' or b.CATEGORYS is null )
+        </if>
+        ) and a.mtu_index = '2'
+        )a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
+        a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
     </select>
 
 
@@ -228,10 +228,10 @@
         select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER  b on a.yo_id = b.id and a.yo_id = #{yoId}
     </select>
 
-<!--    <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">-->
-<!--        select * from MES_RB_FILE_PRESERVE_DETAIL a inner  join MES_RB_FILE_PRESERVE_SLOT  b-->
-<!--            on a.rfps_id = b.id and a.rfps_id = #{id} and a.IS_DELETED = 0-->
-<!--    </select>-->
+    <!--    <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">-->
+    <!--        select * from MES_RB_FILE_PRESERVE_DETAIL a inner  join MES_RB_FILE_PRESERVE_SLOT  b-->
+    <!--            on a.rfps_id = b.id and a.rfps_id = #{id} and a.IS_DELETED = 0-->
+    <!--    </select>-->
 
 
     <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">
@@ -252,7 +252,7 @@
 
     <select id="getDataByWpIdAndIndexList" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select a.* from MES_MAC_TOOL_USE a
-        left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
+                            left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
         where a.WP_ID=#{wpId} and a.mtu_index=#{indexNum} order by a.Id
     </select>
 
@@ -272,13 +272,13 @@
         select a.* from MES_MAC_TOOL_USE a where a.wp_id = #{wpId} and hang_num is not null
     </select>
 
-<!--    <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve">-->
-<!--        select from DS_RB_FILE_PRESERVE a where 1=1-->
-<!--        <if test="wcId != null">-->
-<!--            and a.WC_ID = #{wcId}-->
-<!--        </if>-->
-<!--        and a.PPS_ID = #{ppsId} and a.LINE = 2-->
-<!--    </select>-->
+    <!--    <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve">-->
+    <!--        select from DS_RB_FILE_PRESERVE a where 1=1-->
+    <!--        <if test="wcId != null">-->
+    <!--            and a.WC_ID = #{wcId}-->
+    <!--        </if>-->
+    <!--        and a.PPS_ID = #{ppsId} and a.LINE = 2-->
+    <!--    </select>-->
 
     <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.quality.pojo.entity.ProReTemplate">
         select from QA_PRO_RE_TEMPLATE a where 1=1
@@ -290,9 +290,9 @@
 
 
     <select id="getByRfpsId" resultType="org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO">
-       select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
-       inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
-       where slot.rfp_id =#{rfpsId}
+        select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
+                                                      inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
+        where slot.rfp_id =#{rfpsId}
 
     </select>
 
@@ -300,7 +300,7 @@
     <select id="getByRfpId" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity">
         select a.*  from MES_RB_FILE_PRESERVE_SLOT slot
 --         left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
-        inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
+                             inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
         where slot.RFP_ID =#{rfpId}
 
     </select>
@@ -415,8 +415,8 @@
     <select id="afterPlaReceive" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
         select a.*
         from mes_work_plan a
-        inner join mes_work_plan b on a.FRONT_WP_ID = b.WP_ID
-        inner join mes_WORK_ORDER c on a.WO_ID = c.ID
+                 inner join mes_work_plan b on a.FRONT_WP_ID = b.WP_ID
+                 inner join mes_WORK_ORDER c on a.WO_ID = c.ID
         where a.NEXT_WP_ID is null
           and b.STATUS = 3
           and c.run_status &lt; 15
@@ -438,37 +438,38 @@
     </select>
 
     <select id="selectBsSalaryCalculationPage" resultType="org.springblade.desk.efficiency.pojo.vo.BsSalaryCalculationVO">
+        SELECT * FROM (
         SELECT
-            f.WO_CODE AS woCode,
-            g.PART_CODE AS partCode,
-            g.PART_NAME AS partName,
-            f.BATCH_NO AS batchNo,
-            g.USE_DEPT AS useDept,
-            g.PLATE AS plate,
-            i.WC_NAME AS wcName,
-            e.TS_NAME AS team,
-            b.NAME AS ppsName,
-            a.HOUR_QUOTA AS hourQuota,
-            c.WORK_QTY AS workQty,
-            d.REAL_NAME AS worker,
-            k.PRODUCT_TYPE AS productType,
-            g.PRODUCT_IDENT AS prodIdent,
-            a.WORK_QTY AS singleBatchNo,
-            f.inventory_qty AS putQuantity,
-            f.scrap_qty AS scrapQty,
-            f.loss_qty AS lossQty,
-            f.test_qty AS testQty,
-            g.YP_AREA AS poArea,
-            a.WORK_QTY * g.YP_AREA AS totalArea,
-            f.put_store_time AS putStoreTime,
-            a.WP_MONEY AS wpMoney,
-            a.BASE_AMOUNT as baseAmount,
-            a.SUBSIDY_AMOUNT as subsidyAmount,
-            k.PLATE_THICKNESS as plateThickness,
-            CASE WHEN a.BASE_AMOUNT IS NULL AND a.SUBSIDY_AMOUNT IS NULL
-            THEN NULL
-            ELSE NVL(a.BASE_AMOUNT, 0) + NVL(a.SUBSIDY_AMOUNT, 0)
-            END AS totalAmount
+        f.WO_CODE AS woCode,
+        g.PART_CODE AS partCode,
+        g.PART_NAME AS partName,
+        f.BATCH_NO AS batchNo,
+        g.USE_DEPT AS useDept,
+        g.PLATE AS plate,
+        i.WC_NAME AS wcName,
+        e.TS_NAME AS team,
+        b.NAME AS ppsName,
+        a.HOUR_QUOTA AS hourQuota,
+        c.WORK_QTY AS workQty,
+        d.REAL_NAME AS worker,
+        k.PRODUCT_TYPE AS productType,
+        g.PRODUCT_IDENT AS prodIdent,
+        a.WORK_QTY AS singleBatchNo,
+        f.inventory_qty AS putQuantity,
+        f.scrap_qty AS scrapQty,
+        f.loss_qty AS lossQty,
+        f.test_qty AS testQty,
+        g.YP_AREA AS poArea,
+        a.WORK_QTY * g.YP_AREA AS totalArea,
+        f.put_store_time AS putStoreTime,
+        a.WP_MONEY AS wpMoney,
+        a.BASE_AMOUNT as baseAmount,
+        a.SUBSIDY_AMOUNT as subsidyAmount,
+        k.PLATE_THICKNESS as plateThickness,
+        CASE WHEN a.BASE_AMOUNT IS NULL AND a.SUBSIDY_AMOUNT IS NULL
+        THEN NULL
+        ELSE NVL(a.BASE_AMOUNT, 0) + NVL(a.SUBSIDY_AMOUNT, 0)
+        END AS totalAmount
         FROM MES_WORK_PLAN a
         INNER JOIN BS_PROCESS_SET b ON a.PPS_ID = b.ID AND b.IS_DELETED = 0
         INNER JOIN MES_MAKE_REC c ON a.ID = c.WP_ID AND c.IS_DELETED = 0
@@ -478,7 +479,8 @@
         INNER JOIN MES_YIELD_ORDER g ON f.YO_ID = g.ID AND g.IS_DELETED = 0
         INNER JOIN BS_CENTER_TEAM h ON e.ID = h.TS_ID AND e.WC_ID = h.WC_ID AND h.IS_DELETED = 0
         INNER JOIN BS_WORK_CENTER i ON h.WC_ID = i.ID AND i.IS_DELETED = 0
-        INNER JOIN DS_PART_VERSION j on g.part_code = j.part_code and g.part_version = j.part_version and j.IS_DELETED = 0
+        INNER JOIN DS_PART_VERSION j on g.part_code = j.part_code and g.part_version = j.part_version and j.IS_DELETED =
+        0
         INNER JOIN DS_PART k ON j.part_id = k.ID AND k.IS_DELETED = 0
         INNER JOIN MES_QUALITY_GRADE l on g.PRODUCT_IDENT = l.QUALITY_GRADE
         <where>
@@ -554,21 +556,32 @@
             </if>
 
         </where>
+        )
+        <choose>
+            <when test="bsSalaryCalculation.orderByField != null and bsSalaryCalculation.orderByField != ''">
+                ORDER BY ${bsSalaryCalculation.orderByField}
+                <if test="bsSalaryCalculation.isAsc">ASC</if>
+                <if test="!bsSalaryCalculation.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY putStoreTime desc
+            </otherwise>
+        </choose>
     </select>
     <select id="getByCardNoByPlanAll" resultType="org.springblade.desk.produce.pojo.vo.AllWorkPlanVO">
         SELECT
-        b.CARD_NO AS cardNo,
-        b.WO_CODE AS woCode,
-        b.PART_CODE AS partCode,
-        b.BATCH_NO AS batchNo,
-        a.ID AS wpId,
-        a.orders AS orders,
-        c.NAME AS ppsName,
-        a.STATUS AS status
+            b.CARD_NO AS cardNo,
+            b.WO_CODE AS woCode,
+            b.PART_CODE AS partCode,
+            b.BATCH_NO AS batchNo,
+            a.ID AS wpId,
+            a.orders AS orders,
+            c.NAME AS ppsName,
+            a.STATUS AS status
         FROM
-        mes_work_plan a
-        INNER JOIN mes_work_order b ON a.WO_ID = b.ID
-        LEFT JOIN BS_PROCESS_SET c ON a.PPS_ID = c.ID
+            mes_work_plan a
+                INNER JOIN mes_work_order b ON a.WO_ID = b.ID
+                LEFT JOIN BS_PROCESS_SET c ON a.PPS_ID = c.ID
         WHERE a.WO_ID = #{id} AND b.IS_DELETED = 0
         ORDER BY a.ORDERS
     </select>