出库相关

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java

@@ -60,5 +60,7 @@ public class BusDeliveredApplyQuery implements Query {
     private String applyName;
     @ApiModelProperty(value = "申请人sid")
     private String applySid;
+    @ApiModelProperty("销售类型")
+    private String paymentMethodKey;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java

@@ -26,4 +26,6 @@ public class BusDeliveredExamineQuery implements Query {
     private String staffSid;
     @ApiModelProperty("orgPath")
     private String orgPath;
+    
+    private String paymentMethodKey;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -183,7 +183,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             //客户名称
             if (StringUtils.isNotBlank(query.getName())) {
-                qw.eq("bd.name", query.getName());
+                qw.like("bd.name", query.getName());
             }
             if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
                 qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd());
@@ -192,6 +192,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 qw.like("bd.applyName", query.getApplyName());
             }
             qw.eq("bd.applySid", query.getApplySid());
+            if(StringUtils.isNotBlank(query.getPaymentMethodKey())){
+                qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
+            }
         }
         return qw;
     }
@@ -415,7 +418,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             //客户名称
             if (StringUtils.isNotBlank(query.getName())) {
-                qw.eq("bd.name", query.getName());
+                qw.like("bd.name", query.getName());
             }
             if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
                 qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd());
@@ -434,6 +437,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             qw.eq("bd.useOrgSid", orgSid);
             qw.ne("bd.state", 1);
+            if(StringUtils.isNotBlank(query.getPaymentMethodKey())){
+                qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
+            }
         }
         return qw;
     }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml

@@ -159,14 +159,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="endDate != null and endDate != ''">
                     AND ahpi.START_TIME_ <![CDATA[ <=  ]]> #{endDate}
                 </if>
-                <if test="names != null and names != ''">
-                    and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+                <if test="proDefName != null and proDefName != ''">
+                    and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{proDefName},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+                </if>
+                <if test="startUserSid != null and startUserSid != ''">
+                    and A0.NAME_ = 'INITIATOR' and A0.TEXT_ LIKE concat('%',#{startUserSid},'%')
                 </if>
             </where>
         ) flow
         GROUP BY flow.PROC_INST_ID_
         ORDER BY flow.START_TIME_ DESC
-        <!--LIMIT #{page},#{size}-->
+        LIMIT #{page},#{size}
     </select>
     <select id="finishedListCount" parameterType="java.util.Map" resultType="int">
         SELECT COUNT(DISTINCT ahpi.PROC_INST_ID_)
@@ -176,15 +179,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INNER JOIN `ACT_HI_VARINST` A0 ON ahpi.PROC_INST_ID_ = A0.PROC_INST_ID_
         LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_
         <where>
-            <if test="proDefName != null and proDefName != ''">
+           <!-- <if test="proDefName != null and proDefName != ''">
                 AND arpd.NAME_ LIKE concat('%',#{proDefName},'%')
-            </if>
+            </if>-->
             <if test="startDate != null and startDate != ''">
                 AND ahpi.START_TIME_ <![CDATA[ >=  ]]> #{startDate}
             </if>
             <if test="endDate != null and endDate != ''">
                 AND ahpi.START_TIME_ <![CDATA[ <=  ]]> #{endDate}
             </if>
+            <if test="names != null and names != ''">
+                and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
+            </if>
+            <if test="startUserSid != null and startUserSid != ''">
+                and A0.NAME_ = 'INITIATOR' and A0.TEXT_ LIKE concat('%',#{startUserSid},'%')
+            </if>
         </where>
     </select>
 

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -465,7 +465,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
 
         Page<FlowTaskDto> page = new Page<>();
         TaskQuery taskQuery = taskService.createTaskQuery();
-        String startUserNameParams = "";
+        String startUserSidParams = "";
         String names = "";
 
         // 流程参数
@@ -486,8 +486,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     }
                 }
                 //发起人姓名查询
-                if("startUserName".equals(btq.getField())){
-                    startUserNameParams = btq.getValue();
+                if("startUserSid".equals(btq.getField())){
+                    startUserSidParams = btq.getValue();
                 }
             }
             if("proDefName".equals(btq.getField())){
@@ -505,6 +505,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
                     or.endOr();
                 }
+                if(StringUtils.isNotBlank(startUserSidParams)){
+                    or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
+                }
                 //.taskCandidateGroupIn(roleSidList)
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
@@ -582,18 +585,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             flowList.add(flowTask);
         }
-        //筛选发起人==============================
-        /*if (StringUtils.isNotBlank(startUserNameParams)) {
-            String finalStartUserNameParams = startUserNameParams;
-            flowList = flowList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(names)){
-            String finalNames = names;
-            flowList = flowList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList());
-        }
-        page.setTotal(flowList.size());
-        flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());*/
         page.setRecords(flowList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
@@ -704,8 +695,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         Page<FlowTaskDto> page = new Page<>();
         Map<String, Object> paraMap = new HashMap<>();
         List<Map<String, Object>> ll = new ArrayList<>();
-        String startUserNameParams = "";
-        String names = "";
         for (BusinessTaskParam btq : params) {
             paraMap.put(btq.getField(), btq.getValue());
             Map<String, Object> mapss = new HashMap<>();
@@ -720,15 +709,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 mapss.put("filed", btq.getField());
             }
             ll.add(mapss);
-            //查询条件发起人
-           /* if("startUserName".equals(btq.getField())){
-                paraMap.remove("startUserName");
-                startUserNameParams = btq.getValue();
-            }
-            if("proDefName".equals(btq.getField())){
-                names = btq.getValue();
-                paraMap.put("names",names);
-            }*/
         }
         paraMap.put("userSid", userSid);
         paraMap.put("list", ll);
@@ -821,18 +801,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             }
             hisTaskList.add(flowTask);
         }
-        //对hisTaskList进行筛选发起人
-       /* if (StringUtils.isNotBlank(startUserNameParams)) {
-            String finalStartUserNameParams = startUserNameParams;
-            hisTaskList = hisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(names)){
-            String finalNames = names;
-            hisTaskList = hisTaskList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList());
-        }
-        page.setTotal(hisTaskList.size());
-        hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
-                collect(Collectors.toList());*/
         page.setTotal(count);
         page.setRecords(hisTaskList);
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
@@ -864,11 +832,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 mapss.put("filed", btq.getField());
             }*/
             ll.add(mapss);
-            if("proDefName".equals(btq.getField())){
+            /*if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
                 paraMap.put("names",names);
                 paraMap.remove("proDefName");
-            }
+            }*/
         }
 
         paraMap.put("userSid", userSid);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowTaskAllQuery.java

@@ -18,6 +18,6 @@ public class FlowTaskAllQuery implements Query {
     private String endDate;//结束日期
     private String orgSid;//部门sid
 
-    @ApiModelProperty(value = "发起人姓名")
-    private String startUserName;
+    @ApiModelProperty("发起人sid")
+    private String startUserSid;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -379,11 +379,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(orgSid);
             taskParamList.add(taskParam);
         }
-        if(StringUtils.isNotBlank(params.getStartUserName())){
+        if(StringUtils.isNotBlank(params.getStartUserSid())){
             BusinessTaskParam taskParam = new BusinessTaskParam();
-            taskParam.setField("startUserName");
+            taskParam.setField("startUserSid");
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
-            taskParam.setValue(params.getStartUserName());
+            taskParam.setValue(params.getStartUserSid());
             taskParamList.add(taskParam);
         }
 
@@ -449,11 +449,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setValue(processDefinitionId);
             taskParamList.add(taskParam);
         }
-        if(StringUtils.isNotBlank(params.getStartUserName())){
+        if(StringUtils.isNotBlank(params.getStartUserSid())){
             BusinessTaskParam taskParam = new BusinessTaskParam();
-            taskParam.setField("startUserName");
+            taskParam.setField("startUserSid");
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
-            taskParam.setValue(params.getStartUserName());
+            taskParam.setValue(params.getStartUserSid());
             taskParamList.add(taskParam);
         }
         taskQuery.setFields(taskParamList);