新增 分发要素部门中间表新增是否回复的字段

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

@@ -41,8 +41,20 @@ public class ZsyzProjectDept extends BaseEntity
     /** 祖级列表 */
     @Excel(name = "祖级列表")
     private String ancestors;
+    /**
+     * 是否回复
+     */
+    private String isHf;
 
-    public void setId(Long id) 
+    public String getIsHf() {
+        return isHf;
+    }
+
+    public void setIsHf(String isHf) {
+        this.isHf = isHf;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -43,6 +43,7 @@ public interface ZsyzProjectDeptMapper
      * @return 结果
      */
     public int updateZsyzProjectDept(ZsyzProjectDept zsyzProjectDept);
+    public int updateZsyzProjectDeptByXmId(ZsyzProjectDept zsyzProjectDept);
 
     /**
      * 删除招商引资_项目和部门关联

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

@@ -70,6 +70,18 @@ public class ZsyzProjectDeptServiceImpl implements IZsyzProjectDeptService
         return zsyzProjectDeptMapper.updateZsyzProjectDept(zsyzProjectDept);
     }
 
+    /**
+     * 修改招商引资_项目和部门关联
+     *
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzProjectDeptByXmId(ZsyzProjectDept zsyzProjectDept) {
+        zsyzProjectDeptMapper.updateZsyzProjectDeptByXmId(zsyzProjectDept);
+        return 0;
+    }
+
     /**
      * 批量删除招商引资_项目和部门关联
      * 

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

@@ -58,7 +58,8 @@ public class ZsyzShyjServiceImpl implements IZsyzShyjService
     @Override
     @DataScope(deptAlias = "s")
     public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj) {
-        return   zsyzShyjMapper.selectZsyzShyjListByWt(zsyzShyj);
+        List<ZsyzShyj> zsyzShyjs = zsyzShyjMapper.selectZsyzShyjListByWt(zsyzShyj);
+        return zsyzShyjs;
     }
 
     /**

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

@@ -9,12 +9,14 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
 import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzShyjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper;
+import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
 import com.ruoyi.system.service.projectV2.IZsyzShyjService;
 import com.ruoyi.system.service.projectV2.common.IZsyzCommonService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,8 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     private ZsyzSkxmMapper zsyzSkxmMapper;
     @Autowired
     private IZsyzShyjService zsyzShyjService;
+    @Autowired
+    private IZsyzProjectDeptService projectDeptService;
 
     @Autowired
     private RedisCache redisCache;
@@ -56,6 +60,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     //主要功能, 对线索进度进行控制
     @Override
     public AjaxResult xssh(ZsyzShyj zsyzShyj) {
+        //todo 可能要知道是什么角色来审核
         //获取审核结果
         String shjg = zsyzShyj.getShjg();
         //往审核意见表插入数据
@@ -66,14 +71,29 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //判断项目阶段
         String progress = zsyzShyj.getXmjd();
         zsyzShyj.setXmjd(xmjd(progress));
+        //如果是要素部门处理,需要修改中间表的回复字段
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (roles != null && roles.size() > 0){
+            for (SysRole role : roles) {
+                if (SZBM.equals(role.getRoleKey())){
+                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept()
+                    zsyzProjectDept.setXmId(zsyzShyj.getXmId());
+                    zsyzProjectDept.setDeptId(dept.getDeptId());
+                    projectDeptService.updateZsyzProjectDeptByXmId(zsyzProjectDept);
+                    break;
+                }
+            }
+        }
         zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
         ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
         zsyzSbbzb.setId(zsyzShyj.getXmId());
+
         if (ONE.equals(shjg)) {
             //通过
             //审核通过需要进入下一阶段/要素部门审核通过,不进行进度前进
             //判断项目进度
             zsyzSbbzb.setProgress(changeProgress(progress));
+
             zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         } else if (TWO.equals(shjg)) {
             //驳回

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

@@ -44,6 +44,14 @@ public interface IZsyzProjectDeptService
      */
     public int updateZsyzProjectDept(ZsyzProjectDept zsyzProjectDept);
 
+    /**
+     * 修改招商引资_项目和部门关联
+     *
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    public int updateZsyzProjectDeptByXmId(ZsyzProjectDept zsyzProjectDept);
+
     /**
      * 批量删除招商引资_项目和部门关联
      * 

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="ancestors"    column="ancestors"    />
+        <result property="isHf"    column="is_hf"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzProjectDeptVo">
-        select id, xm_id, xmbh, xmmc, dept_id, dept_name, ancestors, create_by, create_time, update_by, update_time, remark from zsyz_project_dept
+        select id, xm_id, xmbh, xmmc, dept_id, dept_name, ancestors,is_hf, create_by, create_time, update_by, update_time, remark from zsyz_project_dept
     </sql>
 
     <select id="selectZsyzProjectDeptList" parameterType="ZsyzProjectDept" resultMap="ZsyzProjectDeptResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
             <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="isHf != null and isHf != ''"> and is_hf = #{isHf}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
         </where>
@@ -49,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null">dept_name,</if>
             <if test="ancestors != null">ancestors,</if>
+            <if test="isHf != null">is_hf,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
             <if test="ancestors != null">#{ancestors},</if>
+            <if test="isHf != null">#{isHf},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -79,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="ancestors != null">ancestors = #{ancestors},</if>
+            <if test="isHf != null and is_hf != ''">is_hf = #{isHf},</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>
@@ -87,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <update id="updateZsyzProjectDeptByXmId" parameterType="ZsyzProjectDept">
+        update zsyz_project_dept ser is_hf = 'Y' where xm_id = #{xmId} and dept_id = #{deptId}
+    </update>
 
     <delete id="deleteZsyzProjectDeptById" parameterType="Long">
         delete from zsyz_project_dept where id = #{id}

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

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectZsyzShyjVo"/>
         where l.id = #{id}
     </select>
-    <select id="selectZsyzShyjListByWt" parameterType="Long" resultMap="ZsyzShyjResult">
+    <select id="selectZsyzShyjListByWt"  resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ),
         ANY_VALUE ( s.xm_id ),