|
@@ -284,10 +284,10 @@ public class CwjsPolicyInfoController {
|
|
|
//直接转到政策审核角色人员
|
|
|
cwjsPolicyInfo.setApprovedStatus(1);
|
|
|
//政策审核人员
|
|
|
- List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
- if (!Check.isNull(users)) {
|
|
|
- cwjsPolicyInfo.setApprovedProgress(users.get(0).getId()); //设置政策审核角色人员
|
|
|
- }
|
|
|
+// List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
+// if (!Check.isNull(users)) {
|
|
|
+// }
|
|
|
+ cwjsPolicyInfo.setApprovedProgress("1747433221403979778"); //设置政策审核角色人员 固定为 郭艳玲(政审)
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
}
|
|
|
} else {
|
|
@@ -303,6 +303,7 @@ 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);
|
|
@@ -481,7 +482,7 @@ public class CwjsPolicyInfoController {
|
|
|
List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
|
|
|
|
|
|
//查询政策审核人员
|
|
|
- List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
+// List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
cwjsPolicyInfos.forEach(cwjsPolicy -> {
|
|
|
CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(), 1); // 查询 被拒 审核意见 最新的一条
|
|
|
cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
|
|
@@ -536,7 +537,7 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicy.setTheBossRight("no");
|
|
|
//政策审核人员 && 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
|
if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
|
|
|
- && !Check.isNull(users) && users.toString().contains(cwjsPolicy.getApprovedProgress())) {
|
|
|
+ && "policyReview".equals(roleCode) && "1747433221403979778".equals(cwjsPolicy.getApprovedProgress())) {
|
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
|
}
|
|
|
/*
|
|
@@ -579,12 +580,14 @@ public class CwjsPolicyInfoController {
|
|
|
//待审核
|
|
|
if (cwjsPolicy.getApprovedStatus() == 1) {
|
|
|
if (StringUtils.equals(cwjsPolicy.getApprovedProgress(), userId)
|
|
|
- || (StringUtils.equals(cwjsPolicy.getApprovedProgress(), "legalAffairs") && StringUtils.equals(roleCode, "legalAffairs"))) {
|
|
|
+ || (StringUtils.equals(cwjsPolicy.getApprovedProgress(), "legalAffairs") && StringUtils.equals(roleCode, "legalAffairs"))
|
|
|
+ || "policyReview".equals(roleCode) && "1747433221403979778".equals(cwjsPolicy.getApprovedProgress())
|
|
|
+ ) {
|
|
|
stringBuilder.append("审核通过").append("|").append("审核拒绝").append("|");
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- //待审核
|
|
|
+ //审核中
|
|
|
if (cwjsPolicy.getApprovedStatus() == 2) {
|
|
|
if (StringUtils.equals(cwjsPolicy.getApprovedProgress(), userId)) {
|
|
|
stringBuilder.append("审核通过").append("|").append("审核拒绝").append("|");
|