|
@@ -263,7 +263,7 @@ public class CwjsPolicyInfoController {
|
|
reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
|
|
reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
return Result.successMsg("审核通过", cwjsPolicyInfo);
|
|
}
|
|
}
|
|
- if (examineUser.getString("departName").contains("销售")) {
|
|
|
|
|
|
+ if (examineUser.getString("departName").contains("销售") && !"b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
|
|
//华北 ---> 通过转政审
|
|
//华北 ---> 通过转政审
|
|
if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")) {
|
|
if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")) {
|
|
//审核人 如果是 赵旺 则需要单独处理 转审上级 丁兆明
|
|
//审核人 如果是 赵旺 则需要单独处理 转审上级 丁兆明
|
|
@@ -299,7 +299,7 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
|
|
|
|
//丁兆明 : b161b7d9793942f980dbfe8c931cd1b0,审核通过直接到老板或者结束
|
|
//丁兆明 : b161b7d9793942f980dbfe8c931cd1b0,审核通过直接到老板或者结束
|
|
- if (approvalUser.equals(userId) && userId.equals("b161b7d9793942f980dbfe8c931cd1b0")) {
|
|
|
|
|
|
+ if (approvalUser.equals(userId) && "b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
|
|
//查询 是否符合条件
|
|
//查询 是否符合条件
|
|
List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
|
|
List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
|
|
cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
|
|
cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
|
|
@@ -534,7 +534,7 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
cwjsPolicy.setTheBossRight("no");
|
|
cwjsPolicy.setTheBossRight("no");
|
|
//丁兆明 : 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
//丁兆明 : 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
- if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4 && "b161b7d9793942f980dbfe8c931cd1b0".equals(cwjsPolicy.getApprovedProgress())&&userId.equals(cwjsPolicy.getApprovedProgress())) {
|
|
|
|
|
|
+ if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4 && "b161b7d9793942f980dbfe8c931cd1b0".equals(cwjsPolicy.getApprovedProgress()) && userId.equals(cwjsPolicy.getApprovedProgress())) {
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
}
|
|
}
|
|
/*
|
|
/*
|