Bladeren bron

政策管理审核

zhaoxian 1 jaar geleden
bovenliggende
commit
c6e65c0d1e

+ 66 - 37
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -180,6 +180,7 @@ public class CwjsPolicyInfoController {
         JSONObject examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicyInfo.getCreateUserId(), "分公司总经理");
         String firstAudit = "";//第一次审核人
 
+        String sendFlag = "1";
         // 提交 - 待审核
         //华北==> 法务  其他===> 销售上级
         if (type == 1) {
@@ -269,51 +270,53 @@ public class CwjsPolicyInfoController {
                 if (examineUser.getString("departName").contains("销售")) {
                     //华北 ---> 自动转老板
                     if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")) {
-
                         //审核人 如果是 赵旺 则需要单独处理 转审上级 丁兆明
                         //查询审核人 上级
                         JSONObject jsonObject = cwjsPolicyInfoMapper.getUserLeaderByUserId(cwjsPolicyInfo.getApprovedProgress());
-                        if (!Check.isNull(jsonObject) &&
-                                (StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(), "00d630a129e4487cba5427788a1f08ce")
-                                        || StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(), "7fb2684c348341d193727e791c75dbeb"))) {
-
+                        if (!Check.isNull(jsonObject) && (StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(), "00d630a129e4487cba5427788a1f08ce")
+                                || StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(), "7fb2684c348341d193727e791c75dbeb"))) {
                             // 下一步审核人
                             cwjsPolicyInfo.setApprovedStatus(1);
                             cwjsPolicyInfo.setApprovedProgress(jsonObject.getString("leaderId"));    //设置一下个审核人员
 
                         } else {
-                            //查询 是否符合条件
-                            List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
-                                    cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
-                            if (!Check.isNull(autoConveryList)) {
-                                cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
-                                cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
-                                log.info("-----自动转老板");
-                                return Result.successMsg("审核通过", cwjsPolicyInfo);
-                            } else {
-                                //结束
-                                cwjsPolicyInfo.setApprovedStatus(3);
-                                cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
-
-                                /**
-                                 * 终审通过后 添加 起始时间
-                                 */
-                                reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
-                                return Result.successMsg("审核通过", cwjsPolicyInfo);
-
+                            sendFlag = "2";
+                            //直接转到政策审核角色人员
+                            cwjsPolicyInfo.setApprovedStatus(1);
+                            //政策审核人员
+                            List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
+                            if (!Check.isNull(users)) {
+                                cwjsPolicyInfo.setApprovedProgress(users.get(0).getId());    //设置政策审核角色人员
                             }
-
+                            cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
                         }
-
-
                     } else {
                         // 下一步审核 分公司总经理
                         cwjsPolicyInfo.setApprovedStatus(1);
                         cwjsPolicyInfo.setApprovedProgress(examineUser.getString("directorId"));    //设置一下个审核人员  分公司总经理
-
                     }
                 }
+                //审核人角色为 政策审核
+            } else if (StringUtils.equals("policyReview", roleCode)) {
+                //查询 是否符合条件
+                List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
+                        cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
+                if (!Check.isNull(autoConveryList)) {
+                    //符合条件,自动转老板
+                    cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
+                    cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
+                    return Result.successMsg("审核通过", cwjsPolicyInfo);
+                } else {
+                    //不符合,流程结束
+                    cwjsPolicyInfo.setApprovedStatus(3);
+                    cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
+                    /**
+                     * 终审通过后 添加 起始时间
+                     */
+                    reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
+                    return Result.successMsg("审核通过", cwjsPolicyInfo);
+                }
             }
 
             //第三个审核人- 分公司总经理
@@ -341,14 +344,24 @@ public class CwjsPolicyInfoController {
                 return Result.successMsg("审核通过", cwjsPolicyInfo);
             }
 
-
+            if ("2".equals(sendFlag)) {
+                //政策审核 发送消息到 郭艳玲(16eab477cd7a43538c1049d9678753e0) 李域(2dfcf0fb1ef143298e2db3d5af1271de)
+                sendMsg("16eab477cd7a43538c1049d9678753e0", cwjsPolicyInfo.getCompanyName());
+                sendMsg("2dfcf0fb1ef143298e2db3d5af1271de", cwjsPolicyInfo.getCompanyName());
+            } else {
+                JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfo.getApprovedProgress());
+                StringBuilder text = new StringBuilder();
+                text.append("您有一条销售政策需要审核,该客户为:");
+                text.append(cwjsPolicyInfo.getCompanyName());
+                text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
+                corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId, text.toString());
+            }
             JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfo.getApprovedProgress());
             StringBuilder text = new StringBuilder();
             text.append("您有一条销售政策需要审核,该客户为:");
             text.append(cwjsPolicyInfo.getCompanyName());
             text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
             corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId, text.toString());
-
             CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
             policyApprovalLog.setPolicyId(id);
             policyApprovalLog.setCreateUserId(userId);
@@ -360,7 +373,6 @@ public class CwjsPolicyInfoController {
         }
         if (type == 3) {    //审核拒绝	给申请人发企业微信
             cwjsPolicyInfo.setApprovedStatus(4);
-
             CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
             policyApprovalLog.setApprovalStatus(1);
             policyApprovalLog.setPolicyId(id);
@@ -388,6 +400,14 @@ public class CwjsPolicyInfoController {
 
     }
 
+    private void sendMsg(String userId, String companyName) {
+        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("userId");
+        StringBuilder text = new StringBuilder();
+        text.append("您有一条销售政策需要审核,该客户为:");
+        text.append(companyName);
+        text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
+        corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId, text.toString());
+    }
 
     @Resource
     private CwjsSaleAssistantInfoMapper cwjsSaleAssistantInfoMapper;
@@ -412,9 +432,8 @@ public class CwjsPolicyInfoController {
         //查询用户角色
         String roleCode = roleService.getRoleCodeByUserId(userId);
 
-
         List<String> userIds = new ArrayList<>();
-        if ("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode) || "financialReview".equalsIgnoreCase(roleCode)) {
+        if ("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode) || "financialReview".equalsIgnoreCase(roleCode) || "policyReview".equalsIgnoreCase(roleCode)) {
 
         } else if ("saleDirector".equalsIgnoreCase(roleCode)) {
             //总监看下属
@@ -461,6 +480,8 @@ public class CwjsPolicyInfoController {
 
         List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
 
+        //查询政策审核人员
+        List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
         cwjsPolicyInfos.forEach(cwjsPolicy -> {
             CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(), 1);    // 查询 被拒 审核意见 最新的一条
             cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
@@ -509,10 +530,14 @@ public class CwjsPolicyInfoController {
 
             }
 
-            //政策当前审核人 = 最后一个审核人 = 当前用户   && 状态不为3 审核通过  && 状态不为4 审核拒绝  ||  当前用户 不是老板
-            // 则显示 转领导审批
             cwjsPolicy.setTheBossRight("no");
-            if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4) {
+            //政策审核人员 && 状态不为3 审核通过  && 状态不为4 审核拒绝 则显示 转领导审批
+            if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
+                    && !Check.isNull(users) && users.toString().contains(cwjsPolicy.getApprovedProgress())) {
+                cwjsPolicy.setTheBossRight("yes");
+            }
+            /*
+            if () {
                 if (StringUtils.equals(cwjsPolicy.getApprovedProgress(), directorUserId) && directorUserId.equals(userId)
                         && !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)) {
 
@@ -534,7 +559,7 @@ public class CwjsPolicyInfoController {
                         }
                     }
                 }
-            }
+            }*/
 
             StringBuilder stringBuilder = new StringBuilder();
 
@@ -1118,5 +1143,9 @@ public class CwjsPolicyInfoController {
         return cwjsPolicyInfoService.getSettlementNoPictureAccountList(paramsVo);
     }
 
+/*
+素材id
 
+
+ */
 }