|
|
@@ -256,7 +256,8 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
//老板
|
|
|
if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
|
|
|
- cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(0);
|
|
|
+ cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
|
|
|
/**
|
|
|
* 终审通过后 添加 起始时间
|
|
|
@@ -288,14 +289,7 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicyInfo.setApprovedStatus(4);
|
|
|
|
|
|
CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
- //老板
|
|
|
- if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
|
|
|
- policyApprovalLog.setApprovalStatus(3);
|
|
|
-
|
|
|
- }else {
|
|
|
- policyApprovalLog.setApprovalStatus(1);
|
|
|
- }
|
|
|
-
|
|
|
+ policyApprovalLog.setApprovalStatus(1);
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "审核拒绝" : approvalContent);
|
|
|
@@ -397,7 +391,7 @@ public class CwjsPolicyInfoController {
|
|
|
CwjsPolicyApprovalLog forwardContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2); // 查询 转发领导的理由 最新的一条
|
|
|
cwjsPolicy.setTheForwardingBossContent(Check.isNull(forwardContent) ? "" : forwardContent.getApprovalContent());
|
|
|
|
|
|
- CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId(),3); // 查询 老板审核意见 最新的一条
|
|
|
+ CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId()); // 查询 老板审核意见 最新的一条
|
|
|
cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
|
|
|
|
|
|
CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(cwjsPolicy.getId()); // 查询 法务 审核意见 最新的一条
|