|
@@ -158,12 +158,20 @@ public class CwjsPolicyInfoController {
|
|
|
Integer type = object.getInteger("type");
|
|
|
String userId = object.getString("userId");
|
|
|
String approvalContent = object.getString("approvalContent");
|
|
|
-
|
|
|
-
|
|
|
CwjsPolicyInfo cwjsPolicyInfo = cwjsPolicyInfoService.getById(id);
|
|
|
+
|
|
|
if (cwjsPolicyInfo == null) {
|
|
|
return Result.error("政策不存在或已被删除,请重新选择要审核的政策。");
|
|
|
}
|
|
|
+ //当前政策审核人
|
|
|
+ String approvalUser = cwjsPolicyInfo.getApprovedProgress();
|
|
|
+ //策略审核人不是 法务 和 政审时,必须 登录人和审核人一致
|
|
|
+ if (!"legalAffairs".equals(approvalUser) && !"1747433221403979778".equals(approvalUser)) {
|
|
|
+ if (!Check.isNull(userId) && !userId.equals(approvalUser)) {
|
|
|
+ return Result.error("该政策已被审核,请刷新政策列表");
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
cwjsPolicyInfo.setLoginUserId(userId);
|
|
|
cwjsPolicyInfo.setApprovalContent(approvalContent);
|
|
|
//获取 公司主题
|
|
@@ -172,10 +180,6 @@ public class CwjsPolicyInfoController {
|
|
|
CwjsCompanySubject companySubject = cwjsCompanySubjectService.getById(companySubjectId);
|
|
|
cwjsPolicyInfo.setCompanyId(companySubject.getCompanyId());
|
|
|
|
|
|
-
|
|
|
- //当前政策审核人
|
|
|
- String approvalUser = cwjsPolicyInfo.getApprovedProgress();
|
|
|
-
|
|
|
//政策所属销售的部门 和 上级
|
|
|
JSONObject examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicyInfo.getCreateUserId(), "分公司总经理");
|
|
|
String firstAudit = "";//第一次审核人
|
|
@@ -263,6 +267,7 @@ public class CwjsPolicyInfoController {
|
|
|
reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
|
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
|
}
|
|
|
+ //丁兆明:b161b7d9793942f980dbfe8c931cd1b0
|
|
|
if (examineUser.getString("departName").contains("销售") && !"b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
|
|
|
//华北 ---> 通过转政审
|
|
|
if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")) {
|
|
@@ -305,7 +310,6 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
|
|
|
if (!Check.isNull(autoConveryList)) {
|
|
|
//符合条件,自动转老板
|
|
|
- cwjsPolicyInfo.setApprovalContent("审核通过");
|
|
|
cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
@@ -355,12 +359,6 @@ public class CwjsPolicyInfoController {
|
|
|
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);
|
|
@@ -380,7 +378,6 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setCreateTime(new Date());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
-
|
|
|
JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
StringBuilder text = new StringBuilder();
|
|
|
text.append("您有一条销售政策审核未通过,客户为:");
|