|
@@ -77,7 +77,7 @@ public class CwjsPolicyInfoController {
|
|
|
IUserCompanyService userCompanyService;
|
|
|
@Autowired
|
|
|
ICwjsPolicyApprovalLogService policyApprovalLogService;
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
CwjsCompanyApprovalUserMapper companyApprovalUserMapper;
|
|
|
@Resource
|
|
|
CwjsCompanySubjectMapper companySubjectMapper;
|
|
@@ -102,7 +102,7 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
@GetMapping(value = "/queryApprovalRejectReason")
|
|
|
public Result<CwjsPolicyApprovalLog> queryApprovalRejectReason(@RequestParam(name="id",required=true) Integer id){
|
|
|
- CwjsPolicyApprovalLog policyApprovalLog = policyApprovalLogService.getOneByPolicyId(id);
|
|
|
+ CwjsPolicyApprovalLog policyApprovalLog = policyApprovalLogService.getOneByPolicyId(id,1);
|
|
|
if(Check.isNull(policyApprovalLog)){
|
|
|
return Result.successMsg("无审核拒绝的记录",null);
|
|
|
}else{
|
|
@@ -214,6 +214,37 @@ public class CwjsPolicyInfoController {
|
|
|
text.append(",请及时登录助手平台-销售政策页面进行政策修改,谢谢!");
|
|
|
corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
}
|
|
|
+
|
|
|
+ //转领导审批 只有审核人是最后一个人的时候 才可以转领导
|
|
|
+ if (type == 4){
|
|
|
+ //根据主体查询 最后一个审核人员
|
|
|
+ CwjsCompanyApprovalUser endApprovalUser = companyApprovalUserMapper.getEndApprovalUserBySub(companySubjectId);
|
|
|
+ if (!userId.equals(endApprovalUser)){
|
|
|
+ return Result.errorMsg("当前所登录用户不是最后一个审核人员,无法转领导审批。");
|
|
|
+ }
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
+ cwjsPolicyInfoEntity.setApprovedProgress("4aba62011120ac565c7f2b9f8f4aa96b"); //设置 boss 为审核人员
|
|
|
+ JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("4aba62011120ac565c7f2b9f8f4aa96b");
|
|
|
+ StringBuilder text = new StringBuilder();
|
|
|
+ text.append("您有一条销售政策需要审核,该客户为:");
|
|
|
+ text.append(cwjsPolicyInfoEntity.getCompanyName());
|
|
|
+ text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
|
|
|
+ corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
|
|
|
+
|
|
|
+ CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
+ policyApprovalLog.setPolicyId(id);
|
|
|
+ policyApprovalLog.setCreateUserId(userId);
|
|
|
+ policyApprovalLog.setApprovalStatus(2);//0-审核通过 1-审核不通过 2-转给领导
|
|
|
+ policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
+ policyApprovalLogService.save(policyApprovalLog);
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfoEntity);
|
|
|
return Result.successMsg("成功",cwjsPolicyInfoEntity);
|
|
|
}
|
|
@@ -251,6 +282,9 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
//查询 对应的销售或 助理
|
|
|
List<String> userIds = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(userId);
|
|
|
+ if (Check.isNull(userIds)){
|
|
|
+ userIds.add(userId);
|
|
|
+ }
|
|
|
|
|
|
/**如果不是管理员,也不是审核人员。
|
|
|
* (看自己和自己下属的所有政策) 修改为 销售-助理 关联关系查看。
|
|
@@ -283,17 +317,20 @@ public class CwjsPolicyInfoController {
|
|
|
List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
|
|
|
|
|
|
cwjsPolicyInfos.forEach(cwjsPolicy ->{
|
|
|
- CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId()); //添加日志记录最新的第一条
|
|
|
+ CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),1); // 查询 被拒 审核意见 最新的一条
|
|
|
if(!Check.isNull(log)){
|
|
|
cwjsPolicy.setApprovalContent(log.getApprovalContent());
|
|
|
}
|
|
|
+ CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2); // 查询 转发领导的 审核意见 最新的一条
|
|
|
+ cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
|
|
|
|
|
|
//根据主体查询 最后一个审核人员
|
|
|
CwjsCompanyApprovalUser approvalUser = companyApprovalUserMapper.getEndApprovalUserBySub(cwjsPolicy.getCompanySubjectId());
|
|
|
- //政策 当前用户 不是 最后一个审核人 || 审核人是老板 && 状态不为3 审核通过
|
|
|
- // 则不显示 转领导审批
|
|
|
- if ((cwjsPolicy.getApprovedProgress().equals(userId) || cwjsPolicy.getApprovedProgress().equals("4aba62011120ac565c7f2b9f8f4aa96b"))
|
|
|
- && cwjsPolicy.getApprovedStatus() != 3){
|
|
|
+ //政策当前审核人 = 最后一个审核人 = 当前用户 && 状态不为3 审核通过 && 状态不为4 审核拒绝 || 当前用户 不是老板
|
|
|
+ // 则显示 转领导审批
|
|
|
+ if (cwjsPolicy.getApprovedProgress().equals(approvalUser.getApprovalUserId()) && approvalUser.getApprovalUserId().equals(userId)
|
|
|
+ && cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
|
|
|
+ && !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)){
|
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
|
}else {
|
|
|
cwjsPolicy.setTheBossRight("no");
|