能耗管理，人效管理列表排序

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -12,7 +12,7 @@ public interface LauncherConstant {
     /**
      * nacos 命名空间
      */
-	//String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
+//	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 //	 生产环境
     String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 //	 测试环境

blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml

@@ -57,7 +57,16 @@
                 AND bu2.real_name LIKE concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%')))
             </if>
         </where>
+        <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">
@@ -92,7 +101,16 @@
                 and t.status = #{status}
             </if>
         </where>
+        <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>

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,8 +51,17 @@
         </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">

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>

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,
@@ -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>

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;
 }

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;
 
 }

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;
+
 
 }

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;
 }

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;
+
 }

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;
+
 }

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;
     
 }

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);

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>

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>
 
 

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>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EnergyTargetMapper.xml

@@ -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>
 
 

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>
 
 

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;
+
 }

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;
+
 }

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;
+
+
 }

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;
+
 }

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;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -438,6 +438,7 @@
     </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,
@@ -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,6 +556,17 @@
             </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