新增 V2版本首页统计/督办/进展说明

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzDbd.java

@@ -90,7 +90,20 @@ public class ZsyzDbd extends BaseEntity
     @Excel(name = "c", width = 30, dateFormat = "yyyy-MM-dd")
     private Date tbTime;
 
-    public void setId(Long id) 
+    /**
+     * 牌 1:黄牌 2:红牌
+     */
+    private String dbType;
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -274,6 +287,7 @@ public class ZsyzDbd extends BaseEntity
             .append("tbr", getTbr())
             .append("phone", getPhone())
             .append("tbTime", getTbTime())
+            .append("dbType", getDbType())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

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

@@ -44,7 +44,7 @@ public class ZsyzShyjServiceImpl implements IZsyzShyjService
      * @return 招商引资_审核意见
      */
     @Override
-    @DataScope
+    @DataScope(deptAlias = "s")
     public List<ZsyzShyj> selectZsyzShyjList(ZsyzShyj zsyzShyj)
     {
         return zsyzShyjMapper.selectZsyzShyjList(zsyzShyj);

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

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.projectV2.ZsyzLdps;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
 import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
@@ -18,9 +17,6 @@ import com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper;
 import com.ruoyi.system.service.projectV2.common.IZsyzCommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -169,9 +165,15 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             map.put("kg", kg);
             map.put("tc", tc);
             map.put("sk", sk);
-            //todo 问题项目 批示 数据放到redis 中缓存, 1小时更新一次
-            map.put("wt", 0);
-
+            //todo 问题项目  只有要素部门意见不通过和承接地不承接的是问题项目
+            ZsyzShyj zsyzShyj = new ZsyzShyj();
+            zsyzShyj.setDeptId(deptId);
+            List<ZsyzShyj> zsyzShyjs = zsyzShyjMapper.selectZsyzShyjList(zsyzShyj);
+            int wt = 0;
+            if (zsyzShyjs != null ){
+                wt = zsyzShyjs.size();
+            }
+            map.put("wt", wt);
             //统计批示项目数量
             long ps = zsyzSbbzbMapper.ldpsListCount(new ZsyzSbbzb());
             map.put("ps", ps);

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

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tbr"    column="tbr"    />
         <result property="phone"    column="phone"    />
         <result property="tbTime"    column="tb_time"    />
+        <result property="dbType"    column="db_type"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzDbdVo">
-        select id, dh, xm_id, xmbh, xmmc, dept_id, dept_name, is_hf, db_time, blsx, dbsx, jzqk, czwt, jjjy, gzjh, tbr, phone, tb_time, create_by, create_time, update_by, update_time, remark from zsyz_dbd
+        select id, dh, xm_id, xmbh, xmmc, dept_id, dept_name, is_hf, db_time, blsx, dbsx, jzqk, czwt, jjjy, gzjh, tbr, phone, tb_time,db_type, create_by, create_time, update_by, update_time, remark from zsyz_dbd
     </sql>
 
     <select id="selectZsyzDbdList" parameterType="ZsyzDbd" resultMap="ZsyzDbdResult">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbr != null  and tbr != ''"> and tbr = #{tbr}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="tbTime != null "> and tb_time = #{tbTime}</if>
+            <if test="dbType != null "> and db_type = #{dbType}</if>
         </where>
     </select>
     
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbr != null">tbr,</if>
             <if test="phone != null">phone,</if>
             <if test="tbTime != null">tb_time,</if>
+            <if test="dbType != null">db_type,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -106,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbr != null">#{tbr},</if>
             <if test="phone != null">#{phone},</if>
             <if test="tbTime != null">#{tbTime},</if>
+            <if test="dbType != null">#{dbType},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -134,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tbr != null">tbr = #{tbr},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="tbTime != null">tb_time = #{tbTime},</if>
+            <if test="dbType != null">db_type = #{dbType},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

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

@@ -292,8 +292,17 @@
     </select>
 
     <select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
-        <include refid="selectZsyzSbbzbVo"/>
-        where id = #{id} and is_del = 'N'
+                select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
+        s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
+        s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
+        s.is_del, s.update_time, s.remark, s.cjd_id,
+        s.cjd_name, s.is_meet, s.meet_remark,
+        j.id,j.xm_id,j.xmbh,j.xmmc,j.dept_id,j.shrxm,j.xmjd,j.shjg,j.shyj,j.shsj
+        from zsyz_sbbzb s
+        left join zsyz_shyj j on s.id = j.xm_id
+        where s.id = #{id} and s.is_del = 'N'
     </select>
 
     <select id="selectZsyzSbbzbListDc" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">

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

@@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shyj != null  and shyj != ''"> and s.shyj = #{shyj}</if>
             <if test="shsj != null "> and s.shsj = #{shsj}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by s.shsj desc
     </select>