Kaynağa Gözat

政策审核

huangxuechao 3 yıl önce
ebeveyn
işleme
07f5704faa

+ 1 - 1
jeecg-boot-base/jeecg-boot-base-api/pom.xml

@@ -14,7 +14,7 @@
 
     <modules>
         <module>jeecg-system-local-api</module>
-        <module>jeecg-system-cloud-api</module>
+<!--        <module>jeecg-system-cloud-api</module>-->
     </modules>
 
     <dependencies>

+ 61 - 4
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -16,13 +16,16 @@ import cn.com.ctop.common.module.service.IUserCompanyService;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 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.CwjsPolicyProduct;
+import org.jeecg.ctop.finance.policy.service.ICwjsPolicyApprovalLogService;
 import org.jeecg.ctop.finance.policy.service.ICwjsPolicyInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -64,8 +67,62 @@ public class CwjsPolicyInfoController {
 	 private ISysRoleService roleService;
 	 @Resource
 	 IUserCompanyService userCompanyService;
+	 @Autowired
+	 ICwjsPolicyApprovalLogService policyApprovalLogService;
+
 	 @Resource
 	 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
@@ -81,9 +138,9 @@ public class CwjsPolicyInfoController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  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());
 		if (roleCode.equals("admin")&&Check.isNull(cwjsPolicyInfo.getCreateUserId())) {	//1.当前登录用户为管理员角色,并且没有传递销售id来精确查询。  则不触发sql的过滤条件
 			cwjsPolicyInfo.setCreateUserIds(null);
@@ -136,7 +193,7 @@ public class CwjsPolicyInfoController {
 
 	 @ApiOperation(value="政策信息表-分页列表查询", notes="政策信息表-分页列表查询")
 	 @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<>();
 		 UserCompany userCompany = userCompanyService.getByUserId(userId);
 		 result.setSuccess(true);

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyApprovalLogMapper.java

@@ -13,5 +13,5 @@ import org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog;
  * @version V1.0
  */
 public interface CwjsPolicyApprovalLogMapper extends BaseMapper<CwjsPolicyApprovalLog> {
-
+    CwjsPolicyApprovalLog getOneByPolicyId(Integer policyId);
 }

+ 3 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.ctop.finance.policy.mapper.CwjsPolicyApprovalLogMapper">
-
+    <select id="getOneByPolicyId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
+        select * from ctop_cwjs_policy_approval_log where policy_id = #{policyId} and approval_status = 1 order by create_time desc LIMIT 1
+    </select>
 </mapper>

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsPolicyApprovalLogService.java

@@ -10,5 +10,5 @@ import org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog;
  * @version V1.0
  */
 public interface ICwjsPolicyApprovalLogService extends IService<CwjsPolicyApprovalLog> {
-
+    CwjsPolicyApprovalLog getOneByPolicyId(Integer policyId);
 }

+ 9 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyApprovalLogServiceImpl.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+
 /**
  * 政策审批记录日志
  * @author jeecg-boot
@@ -15,5 +17,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class CwjsPolicyApprovalLogServiceImpl extends ServiceImpl<CwjsPolicyApprovalLogMapper, CwjsPolicyApprovalLog> implements ICwjsPolicyApprovalLogService {
+    @Resource
+    CwjsPolicyApprovalLogMapper policyApprovalLogMapper;
+
+
+    public CwjsPolicyApprovalLog getOneByPolicyId(Integer policyId){
+        return policyApprovalLogMapper.getOneByPolicyId(policyId);
+    }
 
 }