|
|
@@ -197,6 +197,7 @@ public class CwjsPolicyInfoController {
|
|
|
if(approvalUser.equals(examineUser.getString("leaderId"))){
|
|
|
if(examineUser.getString("departName").contains("渠道")){
|
|
|
cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
+ cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
|
|
|
CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
@@ -426,17 +427,19 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicy.setLegalAffairsContent(Check.isNull(legalContent) ? "" : legalContent.getApprovalContent());
|
|
|
|
|
|
|
|
|
+ JSONObject examineUser = new JSONObject();
|
|
|
String directorUserId = "";
|
|
|
//主体为1 为 华北
|
|
|
if (cwjsPolicy.getCompanySubjectId() == 1){
|
|
|
//查询 该销售 所属的审核人员
|
|
|
//华北审核人员 - 法务==>销售总监(销售上级)==>手动转领导/自动转领导
|
|
|
- directorUserId = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicy.getSaleId(),"法务").getString("leaderId");
|
|
|
-
|
|
|
+ examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicy.getSaleId(),"法务");
|
|
|
+ directorUserId = examineUser.getString("leaderId");
|
|
|
}else {
|
|
|
//查询 该销售 所属的审核人员
|
|
|
//华南审核人员 - 销售总监(销售上级) ==> 分公司经理 ==>转领导
|
|
|
- directorUserId = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicy.getSaleId(),"分公司总经理").getString("directorId");
|
|
|
+ examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicy.getSaleId(),"分公司总经理");
|
|
|
+ directorUserId = examineUser.getString("directorId");
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -447,12 +450,21 @@ public class CwjsPolicyInfoController {
|
|
|
if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
|
|
|
&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
|
|
|
|
|
|
- //查询 是否符合自动转审条件
|
|
|
- List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicy.getAccountingPeriod(),cwjsPolicy.getMediaType(),
|
|
|
- cwjsPolicy.getAdvancePay(),cwjsPolicy.getRebateType(),cwjsPolicy.getRebateRate());
|
|
|
- if (Check.isNull(autoConveryList)){
|
|
|
+ if(examineUser.getString("departName").contains("渠道")){
|
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
|
}
|
|
|
+
|
|
|
+ if(examineUser.getString("departName").contains("销售")){
|
|
|
+ //华北
|
|
|
+ if (cwjsPolicy.getCompanySubjectId() == 1){
|
|
|
+ //查询 是否符合自动转审条件
|
|
|
+ List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicy.getAccountingPeriod(),cwjsPolicy.getMediaType(),
|
|
|
+ cwjsPolicy.getAdvancePay(),cwjsPolicy.getRebateType(),cwjsPolicy.getRebateRate());
|
|
|
+ if (Check.isNull(autoConveryList)){
|
|
|
+ cwjsPolicy.setTheBossRight("yes");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|