修改统计接口,增加查询条件

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/common/ZsyzCommonController.java

@@ -204,4 +204,28 @@ public class ZsyzCommonController extends BaseController {
         //所有审核需要往审核意见表插入数据
         return  zsyzCommonService.xssh(zsyzShyj);
     }
+
+    /**
+     * Cjd的项目审核/驳回接口
+     * 参数是审核建议
+     * @return
+     */
+    @PostMapping("/xsshCjd")
+    @PreAuthorize("@ss.hasPermi('projectV2:common:xsshCjd')")
+    public AjaxResult xsshCjd(@RequestBody ZsyzShyj zsyzShyj) {
+        //所有审核需要往审核意见表插入数据
+        return  zsyzCommonService.xsshCjd(zsyzShyj);
+    }
+
+    /**
+     * 要素部门的项目审核/驳回接口
+     * 参数是审核建议
+     * @return
+     */
+    @PostMapping("/xsshYsbm")
+    @PreAuthorize("@ss.hasPermi('projectV2:common:xsshYsbm')")
+    public AjaxResult xsshYsbm(@RequestBody ZsyzShyj zsyzShyj) {
+        //所有审核需要往审核意见表插入数据
+        return  zsyzCommonService.xsshYsbm(zsyzShyj);
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/constant/CommonConstants.java

@@ -40,6 +40,8 @@ public class CommonConstants {
     public static final String  CJD= "cjd";
     //市直部门
     public static final String  SZBM= "szbm";
+    //要素部门
+    public static final String  YSBM= "ysbm";
     //缓存首页统计数据
     public static final String  INDEX= "index:";
     //错误表述

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzSbbzbServiceImpl.java

@@ -18,16 +18,12 @@ import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.ruoyi.common.constant.CommonConstants.ONE;
-import static com.ruoyi.common.constant.CommonConstants.SZBM;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * 招商引资_申报_首谈信息_主Service业务层处理
@@ -94,7 +90,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         if (roles != null){
             for (SysRole role : roles) {
                 String roleKey = role.getRoleKey();
-                if (SZBM.equals(roleKey)){
+                if (YSBM.equals(roleKey)){
                     //如果是市值部门角色只能看到分派给市值部门的
                     flag = false;
                     break;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/common/ZsyzCommonServiceImpL.java

@@ -78,7 +78,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
         zsyzSbbzb.setId(zsyzShyj.getXmId());
         //如果是要素部门处理,需要修改中间表的回复字段
-        if (SZBM.equals(roleName)) {
+        if (YSBM.equals(roleName)) {
             ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
             zsyzProjectDept.setXmId(zsyzShyj.getXmId());
             zsyzProjectDept.setDeptId(SecurityUtils.getDeptId());
@@ -131,6 +131,132 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         return AjaxResult.success();
     }
 
+    /**
+     * Cjd的项目审核/驳回接口
+     * 参数是审核建议
+     *
+     * @return
+     */
+    @Override
+    public AjaxResult xsshCjd(ZsyzShyj zsyzShyj) {
+        //先获取角色
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        String roleName = "";
+        if (roles != null && roles.size() > 0) {
+            roleName = roles.get(0).getRoleKey();
+        }
+        if (CJD.equals(roleName)) {
+            return AjaxResult.error("当前用户不是承接地角色");
+        }
+        //获取审核结果
+        String shjg = zsyzShyj.getShjg();
+        //判断项目阶段
+        String progress = zsyzShyj.getXmjd();
+        if (!FOR.equals(progress)) {
+            return AjaxResult.error("当前项目状态异常,承接地无法审核");
+        }
+        //根据角色和项目进度来判断能不能审核,判断是否通过
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzShyj.getXmId());
+
+        {
+            if (ONE.equals(shjg)) {
+                //通过
+                //审核通过需要进入下一阶段/要素部门审核通过,不进行进度前进
+                //判断项目进度
+                String progressResult = changeProgress(progress, roleName);
+                if (ERROR.equals(progressResult)) {
+                    return AjaxResult.error("当前状态下您没有审核权限");
+                }
+                zsyzSbbzb.setProgress(progressResult);
+                zsyzSbbzb.setShjg(ONE);
+                zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+            } else if (TWO.equals(shjg)) {
+                String progressResult = changeProgressBack(progress, roleName);
+                if (ERROR.equals(progressResult)) {
+                    return AjaxResult.error("当前状态下您没有审核权限");
+                }
+                //驳回
+                zsyzSbbzb.setProgress(progressResult);
+                zsyzSbbzb.setShjg(TWO);
+                zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+            }
+        }
+        //往审核意见表插入数据
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysDept dept = loginUser.getUser().getDept();
+        zsyzShyj.setDeptId(dept.getDeptId());
+        zsyzShyj.setShrxm(dept.getDeptName());
+        zsyzShyj.setXmjd(xmjd(progress));
+        zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
+        //插入流程记录表
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzShyj.getXmmc());
+        zsyzLcjl.setXmbh(zsyzShyj.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 要素部门的项目审核/驳回接口
+     * 参数是审核建议
+     *
+     * @return
+     */
+    @Override
+    public AjaxResult xsshYsbm(ZsyzShyj zsyzShyj) {
+
+        //先获取角色
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        String roleName = "";
+        if (roles != null && roles.size() > 0) {
+            roleName = roles.get(0).getRoleKey();
+        }
+        if (!YSBM.equals(roleName)) {
+            return AjaxResult.error("当前用户不是要素部门角色");
+        }
+        //判断项目阶段
+        String progress = zsyzShyj.getXmjd();
+        //根据角色和项目进度来判断能不能审核,判断是否通过
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzShyj.getXmId());
+        //如果是要素部门处理,需要修改中间表的回复字段
+
+        ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
+        zsyzProjectDept.setXmId(zsyzShyj.getXmId());
+        zsyzProjectDept.setDeptId(SecurityUtils.getDeptId());
+        //查询是否回复过最新的一条
+        ZsyzProjectDept zsyzProjectDeptOld = projectDeptService.selectZsyzProjectDeptByXmId(zsyzProjectDept);
+        if (zsyzProjectDeptOld != null && "Y".equals(zsyzProjectDeptOld.getIsHf())) {
+            return AjaxResult.error("当前已审核");
+        }
+        projectDeptService.updateZsyzProjectDeptByXmId(zsyzProjectDept);
+
+        //往审核意见表插入数据
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysDept dept = loginUser.getUser().getDept();
+        zsyzShyj.setDeptId(dept.getDeptId());
+        zsyzShyj.setShrxm(dept.getDeptName());
+        zsyzShyj.setXmjd(xmjd(progress));
+        zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
+        //插入流程记录表
+        ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
+        zsyzLcjl.setXmId(zsyzSbbzb.getId());
+        zsyzLcjl.setXmmc(zsyzShyj.getXmmc());
+        zsyzLcjl.setXmbh(zsyzShyj.getXmbh());
+        zsyzLcjl.setDeptId(dept.getDeptId());
+        String deptName = dept.getDeptName();
+        zsyzLcjl.setDeptName(deptName);
+        zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
+        zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
+        return AjaxResult.success();
+    }
+
     /**
      * 首页统计接口
      *
@@ -165,7 +291,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             if (StringUtils.isNotEmpty(roleKey)) {
                 String[] split = roleKey.split(",");
                 for (int i = 0; i < split.length; i++) {
-                    if (SZBM.equals(split[i])) {
+                    if (YSBM.equals(split[i])) {
                         //如果是市直部门则包含承接地数据
                         flag = false;
                         break;
@@ -179,7 +305,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbCjdList(zsyzSbbzb);
             } else {
                 zsyzSbbzb.setDeptId(deptId);
-                //查询指派给市值
+                //查询指派给要素
                 zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
             }
         } else {
@@ -222,11 +348,11 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //todo 问题项目  只有要素部门意见不通过和承接地不承接的是问题项目
         ZsyzShyj zsyzShyj = new ZsyzShyj();
         String xmxsmc = zsyzSbbzb.getXmxsmc();
-        if(StringUtils.isNotEmpty(xmxsmc)){
+        if (StringUtils.isNotEmpty(xmxsmc)) {
             zsyzShyj.setXmmc(xmxsmc);
         }
         Map<String, Object> params = zsyzSbbzb.getParams();
-        if (params != null && params.size() > 0){
+        if (params != null && params.size() > 0) {
             zsyzShyj.setParams(params);
         }
         List<ZsyzShyj> zsyzShyjs = zsyzShyjService.selectZsyzShyjListByWt(zsyzShyj);

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/common/IZsyzCommonService.java

@@ -19,6 +19,20 @@ public interface IZsyzCommonService
     //主要功能, 对线索进度进行控制
   public AjaxResult xssh(ZsyzShyj zsyzShyj);
 
+  /**
+   * Cjd的项目审核/驳回接口
+   * 参数是审核建议
+   * @return
+   */
+  public AjaxResult xsshCjd(ZsyzShyj zsyzShyj);
+
+  /**
+   * 要素部门的项目审核/驳回接口
+   * 参数是审核建议
+   * @return
+   */
+  public AjaxResult xsshYsbm(ZsyzShyj zsyzShyj);
+
   //首页统计接口
   public AjaxResult census(ZsyzSbbzb zsyzSbbzb);