转派 orgcode修改

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java

@@ -294,15 +294,26 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
                 byId.setStaffNo(userServiceById.getWorkNo());
                 byId.setStaffInfo(userServiceById.getWorkNo());
-                byId.setSysOrgCode(transferVo.getOrgCode());
-                SmsCheckCustomerInfo smsCheckCustomerInfo = checkCustomerInfo(byId);
+                //是否是 页面传的orgcode
+                boolean isOrgView=true ;
+                if (StringUtils.isNotBlank(transferVo.getOrgCode())){
+                    byId.setSysOrgCode(transferVo.getOrgCode());
+                    isOrgView=true;
+                }else {
+                    isOrgView=false;
+                }
+                // 转派 可以根据页面传 orgCOde进行 判断    撤回不可以 所以在这让撤回只走 原逻辑   后续要改只需要注释这行即可
+                if (info.equals("out")){
+                    isOrgView=false;
+                }
+                SmsCheckCustomerInfo smsCheckCustomerInfo = checkCustomerInfo(byId,isOrgView);
 
                 customerInfoService.saveOrUpdate(smsCheckCustomerInfo);
+                //转派
                 if (info.equals("in")){
                     transfer.setCreateDate(new Date());
                     transfer.setNewOrgCode(transferVo.getOrgCode());
                     transfer.setNewUserId(transferVo.getUserId());
-
                     transfer.setUserId(userId);
                     transfer.setIds(id);
                     transfer.setNumber(0);
@@ -340,7 +351,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                 transferVo1.setIds(list);
                 transferVo1.setOrgCode(transfer.getOldOrgCode());
                 transferVo1.setUserId(transfer.getOldUserId());
-                boolean trans = trans(transferVo1, ",out");
+                boolean trans = trans(transferVo1, "out");
 
             }
 
@@ -350,7 +361,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         return Result.OK("成功");
     }
 
-    private SmsCheckCustomerInfo checkCustomerInfo(SmsCheckCustomerInfo vo ) {
+    private SmsCheckCustomerInfo checkCustomerInfo(SmsCheckCustomerInfo vo ,boolean isOrgView) {
         // TODO 客户重复性校验、数据合法性校验等
         // 过滤客户编号和员工编号为空的信息
         if (StrUtil.isBlank(vo.getCustomerNo()) && StrUtil.isBlank(vo.getUserNo())) {
@@ -386,31 +397,61 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                 = sysDepartModel.stream().collect(Collectors.toMap(SysDepartModel::getOrgCode,Function.identity(), (o, n) -> o));
         //员工二级部门
         if (sysUser!=null){
-             if (!vo.getSysOrgCode().isEmpty()){
-                 String sysOrgCode = vo.getSysOrgCode();
-                 Set<String>strings=new HashSet<>();
-                Set<String>stringsOrg=new HashSet<>();
-                Set<String>stringsThree=new HashSet<>();
-                Set<String>stringsThreeOrg=new HashSet<>();
-
-                if (sysOrgCode.length()>=3){
-                    String substring = sysOrgCode.substring(0, 3);
-                    strings.add(sysDepartModelMap.get(substring).getDepartName());
-                    stringsOrg.add(substring);
-                }
-                if (sysOrgCode.length()>=6){
-                    String substring = sysOrgCode.substring(0, 6);
-                    stringsThree.add(sysDepartModelMap.get(substring).getDepartName());
-                    stringsThreeOrg.add(substring);
-                }
-                vo.setSysOrgCode(sysOrgCode);
-                vo.setStaffDeptLevel2No(stringsOrg.toString());
-                vo.setStaffDeptLevel2Name(strings.toString());
-                vo.setStaffDeptLevel2(strings.toString()+"("+stringsOrg.toString()+")");
-                vo.setStaffDeptLevel3No(stringsThreeOrg.toString());
-                vo.setStaffDeptLevel3Name(stringsThree.toString());
-                vo.setStaffDeptLevel3(stringsThree.toString()+"("+stringsThreeOrg.toString()+")");
+            if (isOrgView){
+                if (!vo.getSysOrgCode().isEmpty()){
+                    String sysOrgCode = vo.getSysOrgCode();
+                    Set<String>strings=new HashSet<>();
+                    Set<String>stringsOrg=new HashSet<>();
+                    Set<String>stringsThree=new HashSet<>();
+                    Set<String>stringsThreeOrg=new HashSet<>();
+
+                    if (sysOrgCode.length()>=3){
+                        String substring = sysOrgCode.substring(0, 3);
+                        strings.add(sysDepartModelMap.get(substring).getDepartName());
+                        stringsOrg.add(substring);
+                    }
+                    if (sysOrgCode.length()>=6){
+                        String substring = sysOrgCode.substring(0, 6);
+                        stringsThree.add(sysDepartModelMap.get(substring).getDepartName());
+                        stringsThreeOrg.add(substring);
+                    }
+                    vo.setSysOrgCode(sysOrgCode);
+                    vo.setStaffDeptLevel2No(stringsOrg.toString());
+                    vo.setStaffDeptLevel2Name(strings.toString());
+                    vo.setStaffDeptLevel2(strings.toString()+"("+stringsOrg.toString()+")");
+                    vo.setStaffDeptLevel3No(stringsThreeOrg.toString());
+                    vo.setStaffDeptLevel3Name(stringsThree.toString());
+                    vo.setStaffDeptLevel3(stringsThree.toString()+"("+stringsThreeOrg.toString()+")");
+               }
             }
+            //不是页面穿的orgCode
+            if (!isOrgView){
+                 List<String> deptNameByUserId = taskService.getDeptNameByUserId( sysUser.getWorkNo());
+                 if (!deptNameByUserId.isEmpty()) {
+                     Set<String> strings = new HashSet<>();
+                     Set<String> stringsOrg = new HashSet<>();
+                     Set<String> stringsThree = new HashSet<>();
+                     Set<String> stringsThreeOrg = new HashSet<>();
+                     for (String s : deptNameByUserId) {
+                         if (s.length() >= 3) {
+                             String substring = s.substring(0, 3);
+                             strings.add(sysDepartModelMap.get(substring).getDepartName());
+                             stringsOrg.add(substring);
+                         }
+                         if (s.length() >= 6) {
+                             String substring = s.substring(0, 6);
+                             stringsThree.add(sysDepartModelMap.get(substring).getDepartName());
+                             stringsThreeOrg.add(substring);
+                         }
+                     }
+                     vo.setStaffDeptLevel2No(stringsOrg.toString());
+                     vo.setStaffDeptLevel2Name(strings.toString());
+                     vo.setStaffDeptLevel2(strings.toString() + "(" + stringsOrg.toString() + ")");
+                     vo.setStaffDeptLevel3No(stringsThreeOrg.toString());
+                     vo.setStaffDeptLevel3Name(stringsThree.toString());
+                     vo.setStaffDeptLevel3(stringsThree.toString() + "(" + stringsThreeOrg.toString() + ")");
+                 }
+             }
         }
         return vo;
     }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -96,6 +96,18 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         queryWrapper.orderByDesc("create_time");
         Page<SmsCheckTask> page = new Page<>(pageNo, pageSize);
         IPage<SmsCheckTask> pageList = taskService.page(page, queryWrapper);
+
+        // TODO
+//        List<SmsCheckTask> records = pageList.getRecords();
+//        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LambdaQueryWrapper<SmsCheckCustomerInfo> var11 = new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+//                .eq(SmsCheckCustomerInfo::getStaffNo, loginUser.getWorkNo())
+//                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+//
+//        customerInfoService.list(var11);{
+//
+//        }
+//        for (SmsCheckTask record : records)
         return Result.OK(pageList);
     }
 
@@ -290,20 +302,21 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
                 continue;
             }
             info.setStaffUsername(user.getUsername());
-            if (info.getSysOrgCode()==null){
-                infoVo.setResult("0");
-                infoVo.setErrorMsg("机构未查到");
-                listErro.add(infoVo);
-                continue;
-            }
-            List<String> deptNameByUserId = taskService.getDeptNameByUserId(user.getWorkNo());
-            if (!deptNameByUserId.contains(info.getSysOrgCode())){
-                infoVo.setResult("0");
-                infoVo.setErrorMsg("此员工机构选择错误");
-                listErro.add(infoVo);
-                continue;
+            if (info.getSysOrgCode()!=null){
+                if (info.getSysOrgCode()==null){
+                    infoVo.setResult("0");
+                    infoVo.setErrorMsg("机构未查到");
+                    listErro.add(infoVo);
+                    continue;
+                }
+                List<String> deptNameByUserId = taskService.getDeptNameByUserId(user.getWorkNo());
+                if (!deptNameByUserId.contains(info.getSysOrgCode())){
+                    infoVo.setResult("0");
+                    infoVo.setErrorMsg("此员工机构选择错误");
+                    listErro.add(infoVo);
+                    continue;
+                }
             }
-
             if (info.getStaffDeptLevel2Name()==null || info.getStaffDeptLevel2No()==null) {
                 infoVo.setResult("0");
                 infoVo.setErrorMsg("二级部门信息为空");