|
@@ -16,13 +16,16 @@ import cn.com.ctop.common.module.service.IUserCompanyService;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
|
+import org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog;
|
|
import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
|
|
import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
|
|
import org.jeecg.ctop.finance.policy.entity.CwjsPolicyProduct;
|
|
import org.jeecg.ctop.finance.policy.entity.CwjsPolicyProduct;
|
|
|
|
+import org.jeecg.ctop.finance.policy.service.ICwjsPolicyApprovalLogService;
|
|
import org.jeecg.ctop.finance.policy.service.ICwjsPolicyInfoService;
|
|
import org.jeecg.ctop.finance.policy.service.ICwjsPolicyInfoService;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -64,8 +67,62 @@ public class CwjsPolicyInfoController {
|
|
private ISysRoleService roleService;
|
|
private ISysRoleService roleService;
|
|
@Resource
|
|
@Resource
|
|
IUserCompanyService userCompanyService;
|
|
IUserCompanyService userCompanyService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ICwjsPolicyApprovalLogService policyApprovalLogService;
|
|
|
|
+
|
|
@Resource
|
|
@Resource
|
|
private SysUserMapper userMapper;
|
|
private SysUserMapper userMapper;
|
|
|
|
+ @GetMapping(value = "/queryApprovalRejectReason")
|
|
|
|
+ public Result<CwjsPolicyApprovalLog> queryApprovalRejectReason(@RequestParam(name="id",required=true) Integer id){
|
|
|
|
+ CwjsPolicyApprovalLog policyApprovalLog = policyApprovalLogService.getOneByPolicyId(id);
|
|
|
|
+ if(Check.isNull(policyApprovalLog)){
|
|
|
|
+ return Result.successMsg("无审核拒绝的记录",null);
|
|
|
|
+ }else{
|
|
|
|
+ return Result.successMsg("无审核拒绝的记录",policyApprovalLog);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @PostMapping(value = "/policyApproval")
|
|
|
|
+ public Result policyApproval(@RequestParam(name="id",required=true) Integer id,
|
|
|
|
+ @RequestParam(name="type",required=true) Integer type,
|
|
|
|
+ @RequestParam(name="approvalContent",required=false) String approvalContent){
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String roleCode = roleService.getRoleCodeByUserId(user.getId());
|
|
|
|
+ CwjsPolicyInfo cwjsPolicyInfoEntity = cwjsPolicyInfoService.getById(id);
|
|
|
|
+ if(cwjsPolicyInfoEntity==null) {
|
|
|
|
+ return Result.error("未找到对应实体");
|
|
|
|
+ }
|
|
|
|
+ if(type == 1){ //审核提交
|
|
|
|
+ if(roleCode.equals("saleDirector")){//角色是销售总监的话,状态直接是审核中
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
|
+ }else{ //除了销售总监提交的申请都是-待审核
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(1);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if(type == 2){ //审核通过
|
|
|
|
+ if(roleCode.equals("saleDirector")){//角色是销售总监的话,状态直接是审核中
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(2);
|
|
|
|
+ }else{ //除了总监,别人点的包括管理员点通过审核按钮,是直接通过了
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(3);
|
|
|
|
+ }
|
|
|
|
+ CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
|
+ policyApprovalLog.setCreateUserId(user.getId());
|
|
|
|
+ policyApprovalLog.setApprovalStatus(0);
|
|
|
|
+ policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
+ }
|
|
|
|
+ if(type == 3){ //审核拒绝
|
|
|
|
+ cwjsPolicyInfoEntity.setApprovedStatus(4);
|
|
|
|
+ CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
|
|
|
|
+ policyApprovalLog.setCreateUserId(user.getId());
|
|
|
|
+ policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
|
+ policyApprovalLog.setApprovalStatus(1);
|
|
|
|
+ policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
+ }
|
|
|
|
+ cwjsPolicyInfoService.updateById(cwjsPolicyInfoEntity);
|
|
|
|
+ return Result.successMsg("提交成功",null);
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 分页列表查询
|
|
* 分页列表查询
|
|
* @param cwjsPolicyInfo
|
|
* @param cwjsPolicyInfo
|
|
@@ -81,9 +138,9 @@ public class CwjsPolicyInfoController {
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
|
|
|
|
-// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
- LoginUser user = new LoginUser();
|
|
|
|
- user.setId("b161b7d9793942f980dbfe8c931cd1b0"); //a9ab18bf186c463dba715f39f9fa9267
|
|
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+// LoginUser user = new LoginUser();
|
|
|
|
+// user.setId("b161b7d9793942f980dbfe8c931cd1b0"); //a9ab18bf186c463dba715f39f9fa9267
|
|
String roleCode = roleService.getRoleCodeByUserId(user.getId());
|
|
String roleCode = roleService.getRoleCodeByUserId(user.getId());
|
|
if (roleCode.equals("admin")&&Check.isNull(cwjsPolicyInfo.getCreateUserId())) { //1.当前登录用户为管理员角色,并且没有传递销售id来精确查询。 则不触发sql的过滤条件
|
|
if (roleCode.equals("admin")&&Check.isNull(cwjsPolicyInfo.getCreateUserId())) { //1.当前登录用户为管理员角色,并且没有传递销售id来精确查询。 则不触发sql的过滤条件
|
|
cwjsPolicyInfo.setCreateUserIds(null);
|
|
cwjsPolicyInfo.setCreateUserIds(null);
|
|
@@ -136,7 +193,7 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
@ApiOperation(value="政策信息表-分页列表查询", notes="政策信息表-分页列表查询")
|
|
@ApiOperation(value="政策信息表-分页列表查询", notes="政策信息表-分页列表查询")
|
|
@GetMapping(value = "/queryAeraByUserId")
|
|
@GetMapping(value = "/queryAeraByUserId")
|
|
- public Result<UserCompany> queryAeraByUserId(String userId) {
|
|
|
|
|
|
+ public Result<UserCompany> queryAeraByUserId(@RequestParam(name="userId",required=true) String userId) {
|
|
Result<UserCompany> result = new Result<>();
|
|
Result<UserCompany> result = new Result<>();
|
|
UserCompany userCompany = userCompanyService.getByUserId(userId);
|
|
UserCompany userCompany = userCompanyService.getByUserId(userId);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|