|
@@ -234,8 +234,6 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
|
//审核通过 是不是终审,不是就给当前的下一个人发企业微信
|
|
|
if (type == 2) {
|
|
|
-
|
|
|
-
|
|
|
//第一个审核人 - 法务
|
|
|
if (approvalUser.equals("legalAffairs")) {
|
|
|
//查询创建人角色 -- 自己创建的
|
|
@@ -249,55 +247,59 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//查询审核人角色
|
|
|
String roleCode = roleService.getRoleCodeByUserId(approvalUser);
|
|
|
|
|
|
//第二个审核人 = 上级 = 销售总监
|
|
|
//if(approvalUser.equals(examineUser.getString("leaderId"))){
|
|
|
- if (StringUtils.equals("saleDirector", roleCode)) {//审核人角色为销售总监
|
|
|
+ //审核人角色为销售总监
|
|
|
+ if (StringUtils.equals("saleDirector", roleCode)) {
|
|
|
if (examineUser.getString("departName").contains("渠道")) {
|
|
|
cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
-
|
|
|
/**
|
|
|
* 终审通过后 添加 起始时间
|
|
|
*/
|
|
|
reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
|
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
|
}
|
|
|
-
|
|
|
- if (examineUser.getString("departName").contains("销售")) {
|
|
|
- //华北 ---> 自动转老板
|
|
|
+ if (examineUser.getString("departName").contains("销售") && !"b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
|
|
|
+ //华北 ---> 通过转政审
|
|
|
if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")) {
|
|
|
//审核人 如果是 赵旺 则需要单独处理 转审上级 丁兆明
|
|
|
//查询审核人 上级
|
|
|
- JSONObject jsonObject = cwjsPolicyInfoMapper.getUserLeaderByUserId(cwjsPolicyInfo.getApprovedProgress());
|
|
|
+ /* JSONObject jsonObject = cwjsPolicyInfoMapper.getUserLeaderByUserId(cwjsPolicyInfo.getApprovedProgress());
|
|
|
if (!Check.isNull(jsonObject) && (StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(), "00d630a129e4487cba5427788a1f08ce")
|
|
|
|| StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(), "7fb2684c348341d193727e791c75dbeb"))) {
|
|
|
// 下一步审核人
|
|
|
cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
cwjsPolicyInfo.setApprovedProgress(jsonObject.getString("leaderId")); //设置一下个审核人员
|
|
|
|
|
|
- } else {
|
|
|
- sendFlag = "2";
|
|
|
- //直接转到政策审核角色人员
|
|
|
- cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
- //政策审核人员
|
|
|
-// List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
-// if (!Check.isNull(users)) {
|
|
|
-// }
|
|
|
- cwjsPolicyInfo.setApprovedProgress("1747433221403979778"); //设置政策审核角色人员 固定为 郭艳玲(政审)
|
|
|
- cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
- }
|
|
|
+ } else {*/
|
|
|
+ /* List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
+ if (!Check.isNull(users)) {
|
|
|
+ }*/
|
|
|
+ sendFlag = "2";
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
+ cwjsPolicyInfo.setApprovedProgress("1747433221403979778"); //设置政策审核角色人员 固定为 郭艳玲(政审)
|
|
|
+ cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
+// }
|
|
|
} else {
|
|
|
// 下一步审核 分公司总经理
|
|
|
cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
cwjsPolicyInfo.setApprovedProgress(examineUser.getString("directorId")); //设置一下个审核人员 分公司总经理
|
|
|
}
|
|
|
}
|
|
|
- //审核人角色为 政策审核
|
|
|
+ //审核人角色为 政审角色,将一下个审核人置位 丁兆明
|
|
|
} else if (StringUtils.equals("policyReview", roleCode)) {
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
+ cwjsPolicyInfo.setApprovedProgress("b161b7d9793942f980dbfe8c931cd1b0");
|
|
|
+ cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ //丁兆明 : b161b7d9793942f980dbfe8c931cd1b0,审核通过直接到老板或者结束
|
|
|
+ if (approvalUser.equals(userId) && "b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
|
|
|
//查询 是否符合条件
|
|
|
List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
|
|
|
cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
|
|
@@ -311,7 +313,6 @@ public class CwjsPolicyInfoController {
|
|
|
//不符合,流程结束
|
|
|
cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
-
|
|
|
/**
|
|
|
* 终审通过后 添加 起始时间
|
|
|
*/
|
|
@@ -319,13 +320,10 @@ public class CwjsPolicyInfoController {
|
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
//第三个审核人- 分公司总经理
|
|
|
if (approvalUser.equals(examineUser.getString("directorId"))) {
|
|
|
cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 终审通过后 添加 起始时间
|
|
|
*/
|
|
@@ -333,7 +331,7 @@ public class CwjsPolicyInfoController {
|
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
|
}
|
|
|
|
|
|
- //老板
|
|
|
+ //老板:4aba62011120ac565c7f2b9f8f4aa96b
|
|
|
if (approvalUser.equals(userId) && userId.equals("4aba62011120ac565c7f2b9f8f4aa96b")) {
|
|
|
cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
@@ -535,9 +533,8 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
|
|
|
|
cwjsPolicy.setTheBossRight("no");
|
|
|
- //政策审核人员 && 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
|
- if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
|
|
|
- && "policyReview".equals(roleCode) && "1747433221403979778".equals(cwjsPolicy.getApprovedProgress())) {
|
|
|
+ //丁兆明 : 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
|
+ if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4 && "b161b7d9793942f980dbfe8c931cd1b0".equals(cwjsPolicy.getApprovedProgress()) && userId.equals(cwjsPolicy.getApprovedProgress())) {
|
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
|
}
|
|
|
/*
|