Browse Source

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

lamphua 1 year ago
parent
commit
5a25e9f743
21 changed files with 28 additions and 11 deletions
  1. 2
    2
      oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallPlanActivityExecutionListener.java
  2. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcArchiveMapper.xml
  3. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml
  4. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBrandMapper.xml
  5. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml
  6. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml
  7. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDepositMapper.xml
  8. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml
  9. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceExpenseMapper.xml
  10. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceHandoverMapper.xml
  11. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceScrapMapper.xml
  12. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectChangeMapper.xml
  13. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeMapper.xml
  14. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeReportMapper.xml
  15. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml
  16. 1
    1
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleSummaryMapper.xml
  17. 1
    1
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleWorkMapper.xml
  18. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalMapper.xml
  19. 1
    1
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalPlanMapper.xml
  20. 1
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTenderMapper.xml
  21. 7
    6
      oa-back/sql/sql.sql

+ 2
- 2
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallPlanActivityExecutionListener.java View File

12
     @Override
12
     @Override
13
     public void notify(DelegateExecution delegateExecution) {
13
     public void notify(DelegateExecution delegateExecution) {
14
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
14
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
15
-        Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
16
-        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
15
+        Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("109").getUserId().toString());
16
+        delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("109").getUserId().toString());
17
     }
17
     }
18
 }
18
 }

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcArchiveMapper.xml View File

96
             <if test="deptComment != null  and deptComment != ''"> and a.dept_comment = #{deptComment}</if>
96
             <if test="deptComment != null  and deptComment != ''"> and a.dept_comment = #{deptComment}</if>
97
             <if test="archiveComment != null  and archiveComment != ''"> and a.archive_comment = #{archiveComment}</if>
97
             <if test="archiveComment != null  and archiveComment != ''"> and a.archive_comment = #{archiveComment}</if>
98
         </where>
98
         </where>
99
+        order by a.submit_time desc
99
     </select>
100
     </select>
100
     
101
     
101
     <select id="selectCmcArchiveByArchiveId" parameterType="String" resultMap="CmcArchiveResult">
102
     <select id="selectCmcArchiveByArchiveId" parameterType="String" resultMap="CmcArchiveResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml View File

139
             <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
139
             <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
140
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
140
             <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
141
         </where>
141
         </where>
142
+        order by b.apply_date desc
142
     </select>
143
     </select>
143
     
144
     
144
     <select id="selectCmcBorrowByBorrowId" parameterType="String" resultMap="CmcBorrowResult">
145
     <select id="selectCmcBorrowByBorrowId" parameterType="String" resultMap="CmcBorrowResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBrandMapper.xml View File

44
             <if test="cwTime != null "> and b.cw_time = #{cwTime}</if>
44
             <if test="cwTime != null "> and b.cw_time = #{cwTime}</if>
45
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
45
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
46
         </where>
46
         </where>
47
+        order by b.apply_time desc
47
     </select>
48
     </select>
48
     
49
     
49
     <select id="selectCmcBrandByBrandId" parameterType="String" resultMap="CmcBrandResult">
50
     <select id="selectCmcBrandByBrandId" parameterType="String" resultMap="CmcBrandResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml View File

75
             <if test="compiler != null "> and b.compiler = #{compiler}</if>
75
             <if test="compiler != null "> and b.compiler = #{compiler}</if>
76
             <if test="auditor != null "> and b.auditor = #{auditor}</if>
76
             <if test="auditor != null "> and b.auditor = #{auditor}</if>
77
         </where>
77
         </where>
78
+        order by b.create_time desc
78
     </select>
79
     </select>
79
 
80
 
80
     <select id="selectCmcBudgetByBudgetId" parameterType="String" resultMap="CmcBudgetResult">
81
     <select id="selectCmcBudgetByBudgetId" parameterType="String" resultMap="CmcBudgetResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml View File

127
             <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
127
             <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
128
             <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
128
             <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
129
         </where>
129
         </where>
130
+        order by ca.apply_date asc
130
     </select>
131
     </select>
131
 
132
 
132
     <select id="selectCmcCarApprovalByCarApplyId" parameterType="String" resultMap="CmcCarApprovalResult">
133
     <select id="selectCmcCarApprovalByCarApplyId" parameterType="String" resultMap="CmcCarApprovalResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDepositMapper.xml View File

93
             <if test="cwComment != null  and cwComment != ''"> and d.cw_comment = #{cwComment}</if>
93
             <if test="cwComment != null  and cwComment != ''"> and d.cw_comment = #{cwComment}</if>
94
             <if test="cwUserId != null "> and d.cw_user_id = #{cwUserId}</if>
94
             <if test="cwUserId != null "> and d.cw_user_id = #{cwUserId}</if>
95
         </where>
95
         </where>
96
+        order by d.apply_time desc
96
     </select>
97
     </select>
97
     
98
     
98
     <select id="selectCmcDepositByDepositId" parameterType="String" resultMap="CmcDepositResult">
99
     <select id="selectCmcDepositByDepositId" parameterType="String" resultMap="CmcDepositResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml View File

93
             <if test="managerTime != null "> and da.manager_time = #{managerTime}</if>
93
             <if test="managerTime != null "> and da.manager_time = #{managerTime}</if>
94
             <if test="dispatchTime != null "> and da.dispatch_time = #{dispatchTime}</if>
94
             <if test="dispatchTime != null "> and da.dispatch_time = #{dispatchTime}</if>
95
         </where>
95
         </where>
96
+        order by da.apply_date desc
96
     </select>
97
     </select>
97
     
98
     
98
     <select id="selectCmcDeviceApprovalByDeviceApplyId" parameterType="String" resultMap="CmcDeviceApprovalResult">
99
     <select id="selectCmcDeviceApprovalByDeviceApplyId" parameterType="String" resultMap="CmcDeviceApprovalResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceExpenseMapper.xml View File

56
             <if test="occurDate != null "> and de.occur_date = #{occurDate}</if>
56
             <if test="occurDate != null "> and de.occur_date = #{occurDate}</if>
57
             <if test="document != null  and document != ''"> and de.document = #{document}</if>
57
             <if test="document != null  and document != ''"> and de.document = #{document}</if>
58
         </where>
58
         </where>
59
+        order by de.occur_date desc
59
     </select>
60
     </select>
60
     
61
     
61
     <select id="selectCmcDeviceExpenseByDeviceExpenseId" parameterType="Integer" resultMap="CmcDeviceExpenseResult">
62
     <select id="selectCmcDeviceExpenseByDeviceExpenseId" parameterType="Integer" resultMap="CmcDeviceExpenseResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceHandoverMapper.xml View File

73
             <if test="description != null  and description != ''"> and dh.description = #{description}</if>
73
             <if test="description != null  and description != ''"> and dh.description = #{description}</if>
74
             <if test="reason != null  and reason != ''"> and dh.reason = #{reason}</if>
74
             <if test="reason != null  and reason != ''"> and dh.reason = #{reason}</if>
75
         </where>
75
         </where>
76
+        order by dh.handover_date desc
76
     </select>
77
     </select>
77
     
78
     
78
     <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="Integer" resultMap="CmcDeviceHandoverResult">
79
     <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="Integer" resultMap="CmcDeviceHandoverResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceScrapMapper.xml View File

49
             <if test="deal != null  and deal != ''"> and ds.deal = #{deal}</if>
49
             <if test="deal != null  and deal != ''"> and ds.deal = #{deal}</if>
50
             <if test="document != null  and document != ''"> and ds.document = #{document}</if>
50
             <if test="document != null  and document != ''"> and ds.document = #{document}</if>
51
         </where>
51
         </where>
52
+        order by ds.scrap_date desc
52
     </select>
53
     </select>
53
     
54
     
54
     <select id="selectCmcDeviceScrapByDeviceScrapId" parameterType="Integer" resultMap="CmcDeviceScrapResult">
55
     <select id="selectCmcDeviceScrapByDeviceScrapId" parameterType="Integer" resultMap="CmcDeviceScrapResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectChangeMapper.xml View File

50
             <if test="registerTime != null "> and pc.register_time = #{registerTime}</if>
50
             <if test="registerTime != null "> and pc.register_time = #{registerTime}</if>
51
             <if test="undertakingDept != null "> and p.undertaking_dept like concat("%", #{undertakingDept} ,"%")</if>
51
             <if test="undertakingDept != null "> and p.undertaking_dept like concat("%", #{undertakingDept} ,"%")</if>
52
         </where>
52
         </where>
53
+        order by pc.register_time desc
53
     </select>
54
     </select>
54
     
55
     
55
     <select id="selectCmcProjectChangeByChangeId" parameterType="Long" resultMap="CmcProjectChangeResult">
56
     <select id="selectCmcProjectChangeByChangeId" parameterType="Long" resultMap="CmcProjectChangeResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeMapper.xml View File

58
             <if test="disclosureTime != null "> and s.disclosure_time = #{disclosureTime}</if>
58
             <if test="disclosureTime != null "> and s.disclosure_time = #{disclosureTime}</if>
59
             <if test="acceptTime != null "> and s.accept_time = #{acceptTime}</if>
59
             <if test="acceptTime != null "> and s.accept_time = #{acceptTime}</if>
60
         </where>
60
         </where>
61
+        order by s.discloure_time desc
61
     </select>
62
     </select>
62
     
63
     
63
     <select id="selectCmcSafeBySafeId" parameterType="String" resultMap="CmcSafeResult">
64
     <select id="selectCmcSafeBySafeId" parameterType="String" resultMap="CmcSafeResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeReportMapper.xml View File

43
             <if test="content != null  and content != ''"> and sr.content = #{content}</if>
43
             <if test="content != null  and content != ''"> and sr.content = #{content}</if>
44
             <if test="reporter != null "> and sr.reporter = #{reporter}</if>
44
             <if test="reporter != null "> and sr.reporter = #{reporter}</if>
45
         </where>
45
         </where>
46
+        order by sr.report_date desc
46
     </select>
47
     </select>
47
 
48
 
48
     <select id="selectCmcSafeReportBySafeReportId" parameterType="Integer" resultMap="CmcSafeReportResult">
49
     <select id="selectCmcSafeReportBySafeReportId" parameterType="Integer" resultMap="CmcSafeReportResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml View File

131
             <if test="gmTime != null "> and s.gm_time = #{gmTime}</if>
131
             <if test="gmTime != null "> and s.gm_time = #{gmTime}</if>
132
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
132
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
133
         </where>
133
         </where>
134
+        order by s.report_time desc
134
     </select>
135
     </select>
135
     
136
     
136
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
137
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">

+ 1
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleSummaryMapper.xml View File

25
             <if test="amount != null "> and amount = #{amount}</if>
25
             <if test="amount != null "> and amount = #{amount}</if>
26
             <if test="tableNumber != null  and tableNumber != ''"> and table_number = #{tableNumber}</if>
26
             <if test="tableNumber != null  and tableNumber != ''"> and table_number = #{tableNumber}</if>
27
         </where>
27
         </where>
28
-        order by #{summaryId} asc
28
+        order by settle_id asc
29
     </select>
29
     </select>
30
     
30
     
31
     <select id="selectCmcSettleSummaryBySettleId" parameterType="String" resultMap="CmcSettleSummaryResult">
31
     <select id="selectCmcSettleSummaryBySettleId" parameterType="String" resultMap="CmcSettleSummaryResult">

+ 1
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleWorkMapper.xml View File

31
             <if test="groundType != null  and groundType != ''"> and ground_type = #{groundType}</if>
31
             <if test="groundType != null  and groundType != ''"> and ground_type = #{groundType}</if>
32
             <if test="settle != null "> and settle = #{settle}</if>
32
             <if test="settle != null "> and settle = #{settle}</if>
33
         </where>
33
         </where>
34
-        order by  #{workId} asc
34
+        order by work_id asc
35
     </select>
35
     </select>
36
     
36
     
37
     <select id="selectCmcSettleWorkBySettleId" parameterType="String" resultMap="CmcSettleWorkResult">
37
     <select id="selectCmcSettleWorkBySettleId" parameterType="String" resultMap="CmcSettleWorkResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalMapper.xml View File

57
             <if test="disclosureTime != null "> and t.disclosure_time = #{disclosureTime}</if>
57
             <if test="disclosureTime != null "> and t.disclosure_time = #{disclosureTime}</if>
58
             <if test="acceptTime != null "> and t.accept_time = #{acceptTime}</if>
58
             <if test="acceptTime != null "> and t.accept_time = #{acceptTime}</if>
59
         </where>
59
         </where>
60
+        order by t.disclosure_time desc
60
     </select>
61
     </select>
61
     
62
     
62
     <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">
63
     <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">

+ 1
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalPlanMapper.xml View File

85
             <if test="techApprovalTime != null "> and t.tech_approval_time = #{techApprovalTime}</if>
85
             <if test="techApprovalTime != null "> and t.tech_approval_time = #{techApprovalTime}</if>
86
             <if test="manageApprovalTime != null "> and t.manage_approval_time = #{manageApprovalTime}</if>
86
             <if test="manageApprovalTime != null "> and t.manage_approval_time = #{manageApprovalTime}</if>
87
         </where>
87
         </where>
88
-        order by technical_time desc
88
+        order by t.technical_time desc
89
     </select>
89
     </select>
90
 
90
 
91
     <select id="selectCmcTechnicalPlanByTechnicalPlanId" parameterType="String" resultMap="CmcTechnicalPlanResult">
91
     <select id="selectCmcTechnicalPlanByTechnicalPlanId" parameterType="String" resultMap="CmcTechnicalPlanResult">

+ 1
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTenderMapper.xml View File

128
             <if test="tenderPrinter != null "> and t.tender_printer = #{tenderPrinter}</if>
128
             <if test="tenderPrinter != null "> and t.tender_printer = #{tenderPrinter}</if>
129
             <if test="tenderDocument != null  and tenderDocument != ''"> and t.tender_document = #{tenderDocument}</if>
129
             <if test="tenderDocument != null  and tenderDocument != ''"> and t.tender_document = #{tenderDocument}</if>
130
         </where>
130
         </where>
131
+        order by t.tender_id desc
131
     </select>
132
     </select>
132
     
133
     
133
     <select id="selectCmcTenderByTenderId" parameterType="String" resultMap="CmcTenderResult">
134
     <select id="selectCmcTenderByTenderId" parameterType="String" resultMap="CmcTenderResult">

+ 7
- 6
oa-back/sql/sql.sql
File diff suppressed because it is too large
View File


Loading…
Cancel
Save