Browse Source

任务标题,人员多条件查询

lamphua 10 months ago
parent
commit
80e59b3a5c

+ 12
- 5
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java View File

138
     @Resource
138
     @Resource
139
     private ICmcOutsourceService cmcOutsourceService;
139
     private ICmcOutsourceService cmcOutsourceService;
140
     @Resource
140
     @Resource
141
+    private ICmcPerformanceService cmcPerformanceService;
142
+    @Resource
141
     private ICmcBudgetService cmcBudgetService;
143
     private ICmcBudgetService cmcBudgetService;
142
     @Resource
144
     @Resource
143
     private FlowVarInstMapper flowVarInstMapper;
145
     private FlowVarInstMapper flowVarInstMapper;
1634
             CmcDeposit cmcDeposit = cmcDepositService.selectCmcDepositByDepositId(formId);
1636
             CmcDeposit cmcDeposit = cmcDepositService.selectCmcDepositByDepositId(formId);
1635
             projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
1637
             projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
1636
         }
1638
         }
1639
+        if (flowTaskDto.getProcDefName().equals("项目委外")) {
1640
+            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);
1641
+            projectId = cmcOutsource != null ? cmcOutsource.getProjectId() : "";
1642
+            if (projectId == null)
1643
+                flowTaskDto.setTitle(cmcOutsource.getApplyReason());
1644
+        }
1637
         if (projectId != null && !projectId.equals("")){
1645
         if (projectId != null && !projectId.equals("")){
1638
             if (flowTaskDto.getProcDefName().equals("保证金审批"))
1646
             if (flowTaskDto.getProcDefName().equals("保证金审批"))
1639
                 flowTaskDto.setTitle(cmcTenderService.selectCmcTenderByTenderId(projectId).getProjectName());
1647
                 flowTaskDto.setTitle(cmcTenderService.selectCmcTenderByTenderId(projectId).getProjectName());
1659
             if (cmcProcureApproval != null)
1667
             if (cmcProcureApproval != null)
1660
                 flowTaskDto.setTitle(cmcProcureApproval.getApplyReason());
1668
                 flowTaskDto.setTitle(cmcProcureApproval.getApplyReason());
1661
         }
1669
         }
1662
-        if (flowTaskDto.getProcDefName().equals("项目委外")) {
1663
-            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);
1664
-            projectId = cmcOutsource != null ? cmcOutsource.getProjectId() : "";
1665
-            if (projectId == null)
1666
-                flowTaskDto.setTitle(cmcOutsource.getApplyReason());
1670
+        if (flowTaskDto.getProcDefName().equals("绩效审批")) {
1671
+            CmcPerformance cmcPerformance = cmcPerformanceService.selectCmcPerformanceByPerformanceId(formId);
1672
+            if (cmcPerformance != null)
1673
+                flowTaskDto.setTitle(cmcPerformance.getRemark());
1667
         }
1674
         }
1668
     }
1675
     }
1669
 }
1676
 }

+ 2
- 2
oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml View File

122
 			AND find_in_set(#{titles}, u.titles)
122
 			AND find_in_set(#{titles}, u.titles)
123
 		</if>
123
 		</if>
124
 		<if test="certificates != null and certificates != ''">
124
 		<if test="certificates != null and certificates != ''">
125
-			AND find_in_set(#{certificates}, u.certificates})
125
+			AND find_in_set(#{certificates}, u.certificates)
126
 		</if>
126
 		</if>
127
 		<if test="politicalAffiliation != null and politicalAffiliation != ''">
127
 		<if test="politicalAffiliation != null and politicalAffiliation != ''">
128
-			AND find_in_set(#{politicalAffiliation}, u.political_affiliation})
128
+			AND find_in_set(#{politicalAffiliation}, u.political_affiliation)
129
 		</if>
129
 		</if>
130
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
130
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
131
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
131
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')

Loading…
Cancel
Save