|
@@ -179,7 +179,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
|
|
policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
|
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
- policyApprovalLog.setApprovalContent("提交政策。");
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent("提交政策");
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -308,7 +308,6 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
}
|
|
|
if(type == 3){ //审核拒绝 给申请人发企业微信
|
|
if(type == 3){ //审核拒绝 给申请人发企业微信
|
|
|
cwjsPolicyInfo.setApprovedStatus(4);
|
|
cwjsPolicyInfo.setApprovedStatus(4);
|
|
|
- cwjsPolicyInfo.setApprovedProgress(null);
|
|
|
|
|
|
|
|
|
|
CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
//老板
|
|
//老板
|
|
@@ -639,7 +638,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
|
|
policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
|
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
- policyApprovalLog.setApprovalContent("创建政策。");
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent("创建政策");
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
@@ -698,7 +697,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
|
|
policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
|
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
- policyApprovalLog.setApprovalContent("修改政策。");
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent("修改政策");
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
|
|
result.success("修改成功!");
|
|
result.success("修改成功!");
|