金轮

mjava-jinlun/src/main/java/com/malk/jinlun/service/impl/JinlunTaskServiceImpl.java

@@ -786,8 +786,8 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
         List<Map> filterString = new ArrayList<>();
 
         //审核日期为昨天至今天
-        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",131,"","","0"));//审核日期在今天之前N天以后
-//        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FBillNo","67","S305-260505001","","","0"));//单据编号等于XX
+        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",1,"","","0"));//审核日期在今天之前N天以后
+//        filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FBillNo","67","S301-260513014","","","0"));//单据编号等于XX
 
         billQuery.setFilterString(filterString);
         billQuery.setLimit(limit);
@@ -930,13 +930,20 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
                 stringObjectMap.put("StaffSingle1775629353797",cpUserInfo);//销售员
                 stringObjectMap.put("ShortText1775629254048",cpDepartmentMap.get(UtilMap.getString(cpUserInfo,"mainDepartmentId")));//销售部门
             }else {
-                List<Map> cpUserInfoList = cpClient.getCpUserInfo(null, null, null, null, salerName, 0, 1);
+                List<Map> cpUserInfoList = cpClient.getCpUserInfo(null, null, null, null, salerName, 0, 10);
                 if (cpUserInfoList.size() == 1){
                     Map cpUserInfo = (Map) cpUserInfoList.get(0);
                     cpUserInfo.put("type",3);
                     stringObjectMap.put("StaffSingle1775629353797",cpUserInfo);//销售员
                     cpUserMap.put(salerName,cpUserInfo);
 
+                    stringObjectMap.put("ShortText1775629254048",cpDepartmentMap.get(UtilMap.getString(cpUserInfo,"mainDepartmentId")));//销售部门
+                }else if (cpUserInfoList.size() > 1){
+                    Map cpUserInfo = (Map) cpUserInfoList.get(cpUserInfoList.size()-1);
+                    cpUserInfo.put("type",3);
+                    stringObjectMap.put("StaffSingle1775629353797",cpUserInfo);//销售员
+                    cpUserMap.put(salerName,cpUserInfo);
+
                     stringObjectMap.put("ShortText1775629254048",cpDepartmentMap.get(UtilMap.getString(cpUserInfo,"mainDepartmentId")));//销售部门
                 }else {
                     stringObjectMap.put("StaffSingle1775629353797",null);
@@ -948,12 +955,17 @@ public class JinlunTaskServiceImpl implements JinlunTaskService {
                 Map cpUserInfo = new HashMap(cpUserMap.get(gendanName));
                 stringObjectMap.put("StaffSelector1775629377100",cpUserInfo);//跟单员
             }else {
-                List<Map> cpUserInfoList = cpClient.getCpUserInfo(null, null, null, null, gendanName, 0, 1);
+                List<Map> cpUserInfoList = cpClient.getCpUserInfo(null, null, null, null, gendanName, 0, 10);
                 if (cpUserInfoList.size() == 1){
                     Map cpUserInfo = (Map) cpUserInfoList.get(0);
                     cpUserInfo.put("type",3);
                     stringObjectMap.put("StaffSelector1775629377100",cpUserInfo);//跟单员
                     cpUserMap.put(gendanName,cpUserInfo);
+                }else if (cpUserInfoList.size() > 1){
+                    Map cpUserInfo = (Map) cpUserInfoList.get(cpUserInfoList.size()-1);
+                    cpUserInfo.put("type",3);
+                    stringObjectMap.put("StaffSelector1775629377100",cpUserInfo);//跟单员
+                    cpUserMap.put(gendanName,cpUserInfo);
                 }else {
                     stringObjectMap.put("StaffSelector1775629377100",null);
                 }