|
@@ -31,6 +31,7 @@ import org.jeecg.ctop.finance.policy.entity.*;
|
|
|
import org.jeecg.ctop.finance.policy.mapper.CwjsCompanyApprovalUserMapper;
|
|
|
import org.jeecg.ctop.finance.policy.mapper.CwjsCompanySubjectMapper;
|
|
|
import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyApprovalLogMapper;
|
|
|
+import org.jeecg.ctop.finance.policy.mapper.CwjsSaleAssistantInfoMapper;
|
|
|
import org.jeecg.ctop.finance.policy.service.*;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -110,6 +111,14 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 审核
|
|
|
+ * @param id 政策id
|
|
|
+ * @param type 类型
|
|
|
+ * @param userId 用户id
|
|
|
+ * @param approvalContent 审核内容
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@GetMapping(value = "/policyApproval")
|
|
|
public Result policyApproval(@RequestParam(name="id",required=true) Integer id,
|
|
|
@RequestParam(name="type",required=true) Integer type,
|
|
@@ -118,10 +127,14 @@ public class CwjsPolicyInfoController {
|
|
|
// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
CwjsPolicyInfo cwjsPolicyInfoEntity = cwjsPolicyInfoService.getById(id);
|
|
|
if(cwjsPolicyInfoEntity==null) {
|
|
|
- return Result.error("参数传递有误");
|
|
|
+ return Result.error("政策不存在或已被删除,请重新选择要审核的政策。");
|
|
|
}
|
|
|
+ //获取 主体
|
|
|
Integer companySubjectId= cwjsPolicyInfoEntity.getCompanySubjectId();
|
|
|
+
|
|
|
+ // 当前用户是否是审核人
|
|
|
CwjsCompanyApprovalUser cwjsCompanyApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndUserId(companySubjectId, userId);
|
|
|
+
|
|
|
if(type == 1){ //审核提交 等于新增的时候
|
|
|
List<CwjsCompanyApprovalUser> cwjsCompanyApprovalUsers = companyApprovalUserMapper.queryByCompanySubjectId(companySubjectId);
|
|
|
if(Check.isNull(cwjsCompanyApprovalUsers)){
|
|
@@ -205,6 +218,9 @@ public class CwjsPolicyInfoController {
|
|
|
return Result.successMsg("成功",cwjsPolicyInfoEntity);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private CwjsSaleAssistantInfoMapper cwjsSaleAssistantInfoMapper;
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
* @param cwjsPolicyInfo
|
|
@@ -273,13 +289,23 @@ public class CwjsPolicyInfoController {
|
|
|
}
|
|
|
//所有人只要能看到就能有查看的按钮
|
|
|
cwjsPolicy.setOperation("查看");
|
|
|
- if(userIds.contains(userId) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
|
|
|
+
|
|
|
+ //查询助理
|
|
|
+ //List <String> assistantList = cwjsSaleAssistantInfoMapper.getCwAssistantNameListPolicy(userId);
|
|
|
+ if((userIds.contains(userId) || userId.equals(cwjsPolicy.getCreateUserId())) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
|
|
|
cwjsPolicy.setOperation("查看|编辑|提交审核");
|
|
|
}
|
|
|
|
|
|
if(userId.equals(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
|
|
|
cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
|
|
|
}
|
|
|
+ if(userId.equals(cwjsPolicy.getApprovedProgress()) && cwjsPolicy.getApprovedStatus() == 4){
|
|
|
+ cwjsPolicy.setOperation("查看");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
// 用户 公司
|
|
|
UserCompany userCompany = userCompanyService.getByUserId(cwjsPolicy.getCreateUserId());
|
|
|
if(!Check.isNull(userCompany) && Check.isNull(cwjsPolicy.getCreateUserName())){
|