修改问题项目列表和统计

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

@@ -39,9 +39,9 @@ public class ZsyzShyjController extends BaseController
         return getDataTable(list);
     }
 
-    /**
+/*    *//**
      * 查询招商引资_审核意见列表/APP使用首页问题列表
-     */
+     *//*
 
     @GetMapping("/wt")
     public TableDataInfo wt(ZsyzShyj zsyzShyj)
@@ -49,7 +49,7 @@ public class ZsyzShyjController extends BaseController
         startPage();
         List<ZsyzShyj> list = zsyzShyjService.selectZsyzShyjListByWt(zsyzShyj);
         return getDataTable(list);
-    }
+    }*/
 
     /**
      * 导出招商引资_审核意见列表

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.projectV2.common;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.projectV2.*;
@@ -34,30 +35,28 @@ public class ZsyzCommonController extends BaseController {
     @Autowired
     private IZsyzSbbzbService zsyzSbbzbService;
 
-    @Autowired
-    private IZsyzProjectDeptService zsyzProjectDeptService;
-
     @Autowired
     private IZsyzCommonService zsyzCommonService;
-    @Autowired
-    private IZsyzLcjlService zsyzLcjlService;
+
 
     /**
      * 首页统计
+     *
      * @return
      */
     @GetMapping("/census")
-    public AjaxResult census( ZsyzSbbzb zsyzSbbzb) {
-        return  zsyzCommonService.census(zsyzSbbzb);
+    public AjaxResult census(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzCommonService.census(zsyzSbbzb);
     }
 
     /**
      * 首页统计折线图
+     *
      * @return
      */
     @GetMapping("/censusXy")
     public AjaxResult censusXy() {
-        return  zsyzCommonService.censusXy();
+        return zsyzCommonService.censusXy();
     }
 
     /***
@@ -68,11 +67,12 @@ public class ZsyzCommonController extends BaseController {
      */
     @GetMapping("/statistics/month")
     public AjaxResult statisticsMonth(String year, String month) {
-        return  AjaxResult.success(zsyzCommonService.statisticsMonth(year,month));
+        return AjaxResult.success(zsyzCommonService.statisticsMonth(year, month));
     }
 
     /**
      * 生成项目编号接口
+     *
      * @return
      */
     @GetMapping("/xmbh")
@@ -95,66 +95,71 @@ public class ZsyzCommonController extends BaseController {
 
     /**
      * 项目指派接口
+     *
      * @return
      */
     @PostMapping("/xszp")
     @PreAuthorize("@ss.hasPermi('projectV2:common:xszp')")
     public AjaxResult xszp(@RequestBody ZpVo zpVo) {
-        return  zsyzCommonService.xszp(zpVo);
+        return zsyzCommonService.xszp(zpVo);
     }
 
     /**
      * 线索暂存/终止接口
+     *
      * @return
      */
     @PostMapping("/xszc")
     @PreAuthorize("@ss.hasPermi('projectV2:common:xszc')")
     public AjaxResult xszc(@RequestBody ZsyzSbbzb zsyzSbbzb) {
-        return  toAjax(zsyzSbbzbService.updateZsyzSbbzbForZc(zsyzSbbzb));
+        return toAjax(zsyzSbbzbService.updateZsyzSbbzbForZc(zsyzSbbzb));
     }
 
 
-
     /**
      * 招商中心项目审核/驳回接口
      * 参数是审核建议
+     *
      * @return
      */
     @PostMapping("/xssh")
     @PreAuthorize("@ss.hasPermi('projectV2:common:xssh')")
     public AjaxResult xssh(@RequestBody ZsyzShyj zsyzShyj) {
         //所有审核需要往审核意见表插入数据
-        return  zsyzCommonService.xssh(zsyzShyj);
+        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 zsyzCommonService.xsshCjd(zsyzShyj);
     }
 
     /**
      * 要素部门的项目审核/驳回接口
      * 参数是审核建议
+     *
      * @return
      */
     @PostMapping("/xsshYsbm")
     @PreAuthorize("@ss.hasPermi('projectV2:common:xsshYsbm')")
     public AjaxResult xsshYsbm(@RequestBody ZsyzShyj zsyzShyj) {
         //所有审核需要往审核意见表插入数据
-        return  zsyzCommonService.xsshYsbm(zsyzShyj);
+        return zsyzCommonService.xsshYsbm(zsyzShyj);
     }
 
 
     /**
      * 项目撤回
      * 参数是项目
+     *
      * @return
      */
     @PostMapping("/xsch")
@@ -162,4 +167,18 @@ public class ZsyzCommonController extends BaseController {
     public AjaxResult xsch(@RequestBody ZsyzSbbzb zsyzSbbzb) {
         return zsyzCommonService.xsch(zsyzSbbzb);
     }
+
+
+    /**
+     * 查询招商引资_审核意见列表/APP使用首页问题列表
+     */
+
+    @GetMapping("/wt")
+    public TableDataInfo wt() {
+        startPage();
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setXmStatus(THR);
+        List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbList(zsyzSbbzb);
+        return getDataTable(list);
+    }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -81,6 +81,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             //如果项目进度是2,项目承接,招商中心不能审核
             return AjaxResult.error("当前项目已被指派,等待相关部门审核");
         }
+        if (zsyzSbbzb != null && TWO.equals(zsyzSbbzb.getXmStatus())) {
+            //如果项目状态是2已通过
+            return AjaxResult.error("当前项目已审核");
+        }
         if (zsyzSbbzb != null) {
             if (TWO.equals(shjg)) {
                 //通过更改项目状态
@@ -472,12 +476,12 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             //如果不是admin/或者平台管理员 判断是什么角色
             //如果是FALSE 则包含承接地
             if (CJD.equals(roleKey)) {
-                //只查询承接地数据
+                //只查询承接地数据和自己上报的线索
                 zsyzSbbzb.setCjdId(deptId);
                 zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbCjdList(zsyzSbbzb);
             } else {
                 zsyzSbbzb.setDeptId(deptId);
-                //查询指派给要素
+                //查询指派给要素和自己上报的线索
                 zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
             }
         }
@@ -520,7 +524,6 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         map.put(KG, kg);
         map.put(TC, tc);
         map.put(SK, sk);
-        //todo 问题项目  只有要素部门意见不通过和承接地不承接的是问题项目
         ZsyzShyj zsyzShyj = new ZsyzShyj();
         String xmxsmc = zsyzSbbzb.getXmxsmc();
         if (StringUtils.isNotEmpty(xmxsmc)) {
@@ -530,10 +533,13 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         if (params != null && params.size() > 0) {
             zsyzShyj.setParams(params);
         }
-        List<ZsyzShyj> zsyzShyjs = zsyzShyjService.selectZsyzShyjListByWt(zsyzShyj);
+        //问题项目,只要是被驳回的都是问题项目
+        ZsyzSbbzb zsyzSbbzbWt = new ZsyzSbbzb();
+        zsyzSbbzbWt.setXmStatus(THR);
+        List<ZsyzSbbzb> zsyzSbbzbsWt = zsyzSbbzbService.selectZsyzSbbzbList(zsyzSbbzbWt);
         int wt = 0;
-        if (zsyzShyjs != null) {
-            wt = zsyzShyjs.size();
+        if (zsyzSbbzbsWt != null) {
+            wt = zsyzSbbzbsWt.size();
         }
         map.put("wt", wt);
         //统计批示项目数量

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzShyjMapper.java

@@ -33,7 +33,7 @@ public interface ZsyzShyjMapper
      * @param zsyzShyj
      * @return
      */
-    public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj);
+/*    public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj);*/
 
     /**
      * 新增招商引资_审核意见

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

@@ -50,18 +50,18 @@ public class ZsyzShyjServiceImpl implements IZsyzShyjService
         return zsyzShyjMapper.selectZsyzShyjList(zsyzShyj);
     }
 
-    /**
+/*    *//**
      * 统计使用的审核意见/一个项目统计一次
      * @param zsyzShyj
      * @return
-     */
+     *//*
     @Override
     @DataScope(deptAlias = "s")
     public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj) {
         List<ZsyzShyj> zsyzShyjs = zsyzShyjMapper.selectZsyzShyjListByWt(zsyzShyj);
         zsyzShyjs.removeAll(Collections.singleton(null));
         return zsyzShyjs;
-    }
+    }*/
 
     /**
      * 新增招商引资_审核意见

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/IZsyzShyjService.java

@@ -27,7 +27,7 @@ public interface IZsyzShyjService
      * @return 招商引资_审核意见集合
      */
     public List<ZsyzShyj> selectZsyzShyjList(ZsyzShyj zsyzShyj);
-    public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj);
+/*    public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj);*/
 
     /**
      * 新增招商引资_审核意见

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -854,7 +854,7 @@
         <where>
             is_del = 'N'
             <if test="xmxsmc != null  and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
-            <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
+            <if test="cjdId != null ">and (cjd_id = #{cjdId} or dept_id = #{cjdId})</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -48,7 +48,7 @@
     </select>
 
 
-    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+<!--    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ) as id,
         ANY_VALUE ( s.xm_id ) as xm_id ,
@@ -65,20 +65,20 @@
         <where>
             s.shjg = '3'
             <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
-            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
-            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
                 AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
-        <!-- 数据范围过滤 -->
+        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
         ${params.dataScope}
         GROUP BY
         s.xm_id
-    </select>
+    </select>-->
 
-    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+<!--    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         s.id,
         s.xm_id ,