更新

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

@@ -291,7 +291,7 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
         List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
         for (CommonStaff c :
                 list) {
-            geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
+            geTuiUtils.pushByCid("工作事项提醒","您有新的易粮易运流程，请及时审批。",c.getStaffId());
         }
     }
 
@@ -462,11 +462,11 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
                     // 跳过相邻步骤是同一人
                     skipAdjacentSameApprover(instance);
                 }
-                List<CommonStaff> list = getTaskCandidates(instance.getBusinessKey(),instance.getProcessDefinitionKey());
+                List<CommonStaff> list = getTaskCandidates(instance.getProcessDefinitionKey(),instance.getBusinessKey());
 //                List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
                 for (CommonStaff c :
                         list) {
-                    geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
+                    geTuiUtils.pushByCid("工作事项提醒","您有新的易粮易运流程，请及时审批。",c.getStaffId());
                 }
 
             }

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

@@ -63,7 +63,8 @@
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(a.payment_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( a.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower( a.car_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( a.car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower( a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(a.create_date,"%Y%m%d") &gt;=
@@ -216,7 +217,8 @@
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(a.payment_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( a.customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower( a.car_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( a.car_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower( a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         <if test="startDate != null">
             AND (DATE_FORMAT(a.create_date,"%Y%m%d") &gt;=