|
@@ -279,7 +279,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalStatus(3);
|
|
policyApprovalLog.setApprovalStatus(3);
|
|
|
- policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "暂无" : approvalContent);
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
/**
|
|
/**
|
|
|
* 终审通过后 添加 起始时间
|
|
* 终审通过后 添加 起始时间
|
|
@@ -302,7 +302,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
- policyApprovalLog.setApprovalContent("审核通过");
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -343,7 +343,7 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
|
- return Result.successMsg("审核通过",cwjsPolicyInfo);
|
|
|
|
|
|
|
+ return Result.successMsg(type == 3 ? "审核拒绝" : "审核通过",cwjsPolicyInfo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|