项目流转流程更新、流程实例排序

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallPlanActivityExecutionListener.java

@@ -12,7 +12,7 @@ public class CallPlanActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
-        Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
-        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
+        Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("109").getUserId().toString());
+        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("109").getUserId().toString());
     }
 }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcArchiveMapper.xml

@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptComment != null  and deptComment != ''"> and a.dept_comment = #{deptComment}</if>
             <if test="archiveComment != null  and archiveComment != ''"> and a.archive_comment = #{archiveComment}</if>
         </where>
+        order by a.submit_time desc
     </select>
     
     <select id="selectCmcArchiveByArchiveId" parameterType="String" resultMap="CmcArchiveResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml

@@ -139,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
+        order by b.apply_date desc
     </select>
     
     <select id="selectCmcBorrowByBorrowId" parameterType="String" resultMap="CmcBorrowResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBrandMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cwTime != null "> and b.cw_time = #{cwTime}</if>
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
         </where>
+        order by b.apply_time desc
     </select>
     
     <select id="selectCmcBrandByBrandId" parameterType="String" resultMap="CmcBrandResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml

@@ -75,6 +75,7 @@
             <if test="compiler != null "> and b.compiler = #{compiler}</if>
             <if test="auditor != null "> and b.auditor = #{auditor}</if>
         </where>
+        order by b.create_time desc
     </select>
 
     <select id="selectCmcBudgetByBudgetId" parameterType="String" resultMap="CmcBudgetResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -127,6 +127,7 @@
             <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
             <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
         </where>
+        order by ca.apply_date asc
     </select>
 
     <select id="selectCmcCarApprovalByCarApplyId" parameterType="String" resultMap="CmcCarApprovalResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDepositMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cwComment != null  and cwComment != ''"> and d.cw_comment = #{cwComment}</if>
             <if test="cwUserId != null "> and d.cw_user_id = #{cwUserId}</if>
         </where>
+        order by d.apply_time desc
     </select>
     
     <select id="selectCmcDepositByDepositId" parameterType="String" resultMap="CmcDepositResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null "> and da.manager_time = #{managerTime}</if>
             <if test="dispatchTime != null "> and da.dispatch_time = #{dispatchTime}</if>
         </where>
+        order by da.apply_date desc
     </select>
     
     <select id="selectCmcDeviceApprovalByDeviceApplyId" parameterType="String" resultMap="CmcDeviceApprovalResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceExpenseMapper.xml

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="occurDate != null "> and de.occur_date = #{occurDate}</if>
             <if test="document != null  and document != ''"> and de.document = #{document}</if>
         </where>
+        order by de.occur_date desc
     </select>
     
     <select id="selectCmcDeviceExpenseByDeviceExpenseId" parameterType="Integer" resultMap="CmcDeviceExpenseResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceHandoverMapper.xml

@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="description != null  and description != ''"> and dh.description = #{description}</if>
             <if test="reason != null  and reason != ''"> and dh.reason = #{reason}</if>
         </where>
+        order by dh.handover_date desc
     </select>
     
     <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="Integer" resultMap="CmcDeviceHandoverResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceScrapMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deal != null  and deal != ''"> and ds.deal = #{deal}</if>
             <if test="document != null  and document != ''"> and ds.document = #{document}</if>
         </where>
+        order by ds.scrap_date desc
     </select>
     
     <select id="selectCmcDeviceScrapByDeviceScrapId" parameterType="Integer" resultMap="CmcDeviceScrapResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectChangeMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registerTime != null "> and pc.register_time = #{registerTime}</if>
             <if test="undertakingDept != null "> and p.undertaking_dept like concat("%", #{undertakingDept} ,"%")</if>
         </where>
+        order by pc.register_time desc
     </select>
     
     <select id="selectCmcProjectChangeByChangeId" parameterType="Long" resultMap="CmcProjectChangeResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="disclosureTime != null "> and s.disclosure_time = #{disclosureTime}</if>
             <if test="acceptTime != null "> and s.accept_time = #{acceptTime}</if>
         </where>
+        order by s.discloure_time desc
     </select>
     
     <select id="selectCmcSafeBySafeId" parameterType="String" resultMap="CmcSafeResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeReportMapper.xml

@@ -43,6 +43,7 @@
             <if test="content != null  and content != ''"> and sr.content = #{content}</if>
             <if test="reporter != null "> and sr.reporter = #{reporter}</if>
         </where>
+        order by sr.report_date desc
     </select>
 
     <select id="selectCmcSafeReportBySafeReportId" parameterType="Integer" resultMap="CmcSafeReportResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -131,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmTime != null "> and s.gm_time = #{gmTime}</if>
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
+        order by s.report_time desc
     </select>
     
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleSummaryMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amount != null "> and amount = #{amount}</if>
             <if test="tableNumber != null  and tableNumber != ''"> and table_number = #{tableNumber}</if>
         </where>
-        order by #{summaryId} asc
+        order by settle_id asc
     </select>
     
     <select id="selectCmcSettleSummaryBySettleId" parameterType="String" resultMap="CmcSettleSummaryResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleWorkMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groundType != null  and groundType != ''"> and ground_type = #{groundType}</if>
             <if test="settle != null "> and settle = #{settle}</if>
         </where>
-        order by  #{workId} asc
+        order by work_id asc
     </select>
     
     <select id="selectCmcSettleWorkBySettleId" parameterType="String" resultMap="CmcSettleWorkResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalMapper.xml

@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="disclosureTime != null "> and t.disclosure_time = #{disclosureTime}</if>
             <if test="acceptTime != null "> and t.accept_time = #{acceptTime}</if>
         </where>
+        order by t.disclosure_time desc
     </select>
     
     <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalPlanMapper.xml

@@ -85,7 +85,7 @@
             <if test="techApprovalTime != null "> and t.tech_approval_time = #{techApprovalTime}</if>
             <if test="manageApprovalTime != null "> and t.manage_approval_time = #{manageApprovalTime}</if>
         </where>
-        order by technical_time desc
+        order by t.technical_time desc
     </select>
 
     <select id="selectCmcTechnicalPlanByTechnicalPlanId" parameterType="String" resultMap="CmcTechnicalPlanResult">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTenderMapper.xml

@@ -128,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tenderPrinter != null "> and t.tender_printer = #{tenderPrinter}</if>
             <if test="tenderDocument != null  and tenderDocument != ''"> and t.tender_document = #{tenderDocument}</if>
         </where>
+        order by t.tender_id desc
     </select>
     
     <select id="selectCmcTenderByTenderId" parameterType="String" resultMap="CmcTenderResult">