1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -156,6 +156,11 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
     @Override
     public ExpenseInfo getInfo(String id) {
         ExpenseInfo expenseInfo=this.selectById(id);
+        if (StringUtils.isNotBlank(expenseInfo.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(expenseInfo.getWorkflowId()), expenseInfo.getId());
+            String taskId = jsonObject.getString("taskId");
+            expenseInfo.setTaskId(taskId);
+        }
         //费用分配列表
         List<ExpenseAllocationInfo> expenseAllocationInfos = expenseAllocationInfoService.selectList(new EntityWrapper<ExpenseAllocationInfo>()
                 .eq("info_id", id));

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ExpenseInfoMapper.xml

@@ -32,7 +32,8 @@
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(expense_name) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(expense_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(agent) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
     </select>
     <!-- 费用管理列表查询 -->
@@ -76,7 +77,8 @@
             )
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(expense_name) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(expense_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(agent) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(create_date,"%Y%m%d") &gt;=