修改要素部门查询,没有自己新增的线索的问题

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

@@ -215,4 +215,16 @@ public class ZsyzCommonController extends BaseController {
         //所有审核需要往审核意见表插入数据
         return  zsyzCommonService.xsshYsbm(zsyzShyj);
     }
+
+
+    /**
+     * 项目撤回
+     * 参数是项目
+     * @return
+     */
+    @PostMapping("/xsch")
+    @PreAuthorize("@ss.hasPermi('projectV2:common:xsch')")
+    public AjaxResult xsch(@RequestBody ZsyzSbbzb zsyzSbbzb) {
+        return zsyzCommonService.xsch(zsyzSbbzb);
+    }
 }

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

@@ -92,7 +92,7 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertZsyzJzqk(ZsyzJzqk zsyzJzqk)
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();

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

@@ -49,7 +49,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
         ZsyzKgxx zsyzKgxx = zsyzKgxxMapper.selectZsyzKgxxById(id);
         if (zsyzKgxx != null) {
             ZsyzFj zsyzFj = new ZsyzFj();
-            zsyzFj.setSourceId(id);
+            zsyzFj.setSourceId(zsyzKgxx.getId());
             zsyzFj.setType(THR);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {

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

@@ -51,7 +51,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         ZsyzQyxx zsyzQyxx = zsyzQyxxMapper.selectZsyzQyxxById(id);
         if (zsyzQyxx != null) {
             ZsyzFj zsyzFj = new ZsyzFj();
-            zsyzFj.setSourceId(id);
+            zsyzFj.setSourceId(zsyzQyxx.getId());
             zsyzFj.setType(TWO);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {

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

@@ -66,7 +66,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         ZsyzSbbzb zsyzSbbzb = zsyzSbbzbMapper.selectZsyzSbbzbById(id);
         if (zsyzSbbzb != null){
             ZsyzFj zsyzFj = new ZsyzFj();
-            zsyzFj.setSourceId(id);
+            zsyzFj.setSourceId(zsyzSbbzb.getId());
             zsyzFj.setType(ONE);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {
@@ -92,7 +92,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
             for (SysRole role : roles) {
                 String roleKey = role.getRoleKey();
                 if (YSBM.equals(roleKey)){
-                    //如果是要素部门角色只能看到分派给要素部门的
+                    //如果是要素部门角色只能看到分派给要素部门的和自己新增的线索
                     flag = false;
                     break;
                 }
@@ -101,6 +101,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         if (flag){
             zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
         }else {
+            //如果是要素部门角色只能看到分派给要素部门的和自己新增的线索
             zsyzSbbzb.setDeptId(SecurityUtils.getDeptId());
             zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
         }

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

@@ -49,7 +49,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         ZsyzTcxx zsyzTcxx = zsyzTcxxMapper.selectZsyzTcxxById(id);
         if (zsyzTcxx != null) {
             ZsyzFj zsyzFj = new ZsyzFj();
-            zsyzFj.setSourceId(id);
+            zsyzFj.setSourceId(zsyzTcxx.getId());
             zsyzFj.setType(FOR);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {

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

@@ -73,12 +73,12 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             return AjaxResult.error("当前项目已被指派,等待相关部门审核");
         }
         if (zsyzSbbzb != null) {
-            if (ONE.equals(shjg)) {
+            if (TWO.equals(shjg)) {
                 //通过更改项目状态
                 zsyzSbbzb.setXmStatus(TWO);
                 zsyzSbbzb.setShjg(ONE);
                 zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
-            } else if (TWO.equals(shjg)) {
+            } else if (THR.equals(shjg)) {
                 //驳回
                 zsyzSbbzb.setXmStatus(THR);
                 zsyzSbbzb.setShjg(TWO);
@@ -120,7 +120,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         if (roles != null && roles.size() > 0) {
             roleName = roles.get(0).getRoleKey();
         }
-        if (CJD.equals(roleName)) {
+        if (!CJD.equals(roleName)) {
             return AjaxResult.error("当前用户不是承接地角色");
         }
 
@@ -159,8 +159,8 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         zsyzProjectDept.setIsDel("N");
         List<ZsyzProjectDept> zsyzProjectDeptsYsbm = projectDeptService.selectZsyzProjectDeptList(zsyzProjectDept);
 
-
         if (TWO.equals(shjg)) {
+            zsyzSbbzb.setProgress(TWO);
             //承接地审核通过去查询中间表 是否所有指派的要素部门都回复且通过
             if (zsyzProjectDeptsYsbm != null) {
                 Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
@@ -277,6 +277,8 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         List<ZsyzProjectDept> zsyzProjectDeptsCjd = projectDeptService.selectZsyzProjectDeptList(zsyzProjectDept);
 
         if (TWO.equals(shjg)) {
+            //如果承接地也同意/自然是回复过的
+            zsyzSbbzb.setProgress(TWO);
             //审核通过
             //判断是否全部回复
             Map<String, List<ZsyzProjectDept>> collect = zsyzProjectDeptsYsbm.stream().collect(Collectors.groupingBy(ZsyzProjectDept::getIsHf));
@@ -391,24 +393,24 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         if (zsyzSbbzbs != null && zsyzSbbzbs.size() > 0) {
             Map<String, List<ZsyzSbbzb>> collect = zsyzSbbzbs.stream().collect(Collectors.groupingBy(ZsyzSbbzb::getProgress));
 
-            List<ZsyzSbbzb>  stList =  collect.get(ST);
-            if (stList != null){
+            List<ZsyzSbbzb> stList = collect.get(ST);
+            if (stList != null) {
                 st = stList.size();
             }
-            List<ZsyzSbbzb>  cjList =  collect.get(CJ);
-            if (stList != null){
+            List<ZsyzSbbzb> cjList = collect.get(CJ);
+            if (stList != null) {
                 cj = cjList.size();
             }
-            List<ZsyzSbbzb>  qyList =  collect.get(QY);
-            if (stList != null){
+            List<ZsyzSbbzb> qyList = collect.get(QY);
+            if (stList != null) {
                 qy = qyList.size();
             }
-            List<ZsyzSbbzb>  kgList =  collect.get(KG);
-            if (stList != null){
+            List<ZsyzSbbzb> kgList = collect.get(KG);
+            if (stList != null) {
                 kg = kgList.size();
             }
-            List<ZsyzSbbzb>  tcList =  collect.get(TC);
-            if (stList != null){
+            List<ZsyzSbbzb> tcList = collect.get(TC);
+            if (stList != null) {
                 tc = tcList.size();
             }
             all = zsyzSbbzbs.size();
@@ -492,24 +494,24 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 int kgNub = 0;
                 int tcNub = 0;
                 Map<String, List<ZsyzSbbzb>> collect = zsyzSbbzbs.stream().collect(Collectors.groupingBy(ZsyzSbbzb::getProgress));
-                List<ZsyzSbbzb>  stList =  collect.get(ST);
-                if (stList != null){
+                List<ZsyzSbbzb> stList = collect.get(ST);
+                if (stList != null) {
                     stNub = stList.size();
                 }
-                List<ZsyzSbbzb>  cjList =  collect.get(CJ);
-                if (stList != null){
+                List<ZsyzSbbzb> cjList = collect.get(CJ);
+                if (stList != null) {
                     cjNub = cjList.size();
                 }
-                List<ZsyzSbbzb>  qyList =  collect.get(QY);
-                if (stList != null){
+                List<ZsyzSbbzb> qyList = collect.get(QY);
+                if (stList != null) {
                     qyNub = qyList.size();
                 }
-                List<ZsyzSbbzb>  kgList =  collect.get(KG);
-                if (stList != null){
+                List<ZsyzSbbzb> kgList = collect.get(KG);
+                if (stList != null) {
                     kgNub = kgList.size();
                 }
-                List<ZsyzSbbzb>  tcList =  collect.get(TC);
-                if (stList != null){
+                List<ZsyzSbbzb> tcList = collect.get(TC);
+                if (stList != null) {
                     tcNub = tcList.size();
                 }
                 st.add(stNub);
@@ -593,43 +595,26 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         return AjaxResult.success();
     }
 
-
-    //更改项目进度前进
-    public String changeProgress(String progress, String roleName) {
-        if (ONE.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = TWO;
-        } else if (FOR.equals(progress) && (CJD.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = FIV;
-        } else if (SIX.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = SEV;
-        } else if (EIG.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = NIN;
-        } else if (TEN.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = ELE;
-        }//项目入归暂时保留
-        else {
-            progress = ERROR;
+    /**
+     * 撤回
+     *
+     * @param zsyzSbbzb
+     * @return
+     */
+    @Override
+    public AjaxResult xsch(ZsyzSbbzb zsyzSbbzb) {
+        String progress = zsyzSbbzb.getProgress();
+        String xmStatus = zsyzSbbzb.getXmStatus();
+        //只有项目状态是已通过
+        if (!TWO.equals(xmStatus)) {
+            return AjaxResult.error("当前状态不能撤回");
         }
-        return progress;
-    }
-
-    //更改项目进度后退
-    public String changeProgressBack(String progress, String roleName) {
-        if (TWO.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = ONE;
-        } else if (FOR.equals(progress) && (CJD.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = TWO;
-        } else if (SIX.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = FIV;
-        } else if (EIG.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = SEV;
-        } else if (TEN.equals(progress) && (MANAGE.equals(roleName) || ADMIN.equals(roleName))) {
-            progress = NIN;
-        }//项目入归暂时保留
-        else {
-            progress = ERROR;
+        if (!TWO.equals(progress)) {
+            return AjaxResult.error("当前项目进度不能撤回");
         }
-        return progress;
+        zsyzSbbzb.setXmStatus(ONE);
+        zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+        return AjaxResult.success();
     }
 
     //根据项目进度判断项目阶段

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

@@ -45,4 +45,6 @@ public interface IZsyzCommonService
    * @return
    */
   public AjaxResult xszp(ZpVo zpVo);
+  //撤回
+  public AjaxResult xsch(ZsyzSbbzb zsyzSbbzb);
 }

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

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZsyzFjList" parameterType="ZsyzFj" resultMap="ZsyzFjResult">
         <include refid="selectZsyzFjVo"/>
-        <where>  
+        <where>
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
             <if test="sourceId != null "> and source_id = #{sourceId}</if>

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

@@ -407,8 +407,8 @@
         ${params.dataScope}
         order by s.create_time desc
     </select>
-    <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
-        select s.id,
+    <select id="selectZsyzSbbzbListByZp" resultMap="ZsyzSbbzbResult">
+        SELECT * from ( select s.id,
         s.sbdw,
         s.tbrq,
         s.zszxfzr,
@@ -470,6 +470,73 @@
         <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
             AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
+
+        UNION
+
+        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.xm_status,
+        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
+        from zsyz_sbbzb s
+        where s.is_del = 'N'
+        <if test="deptId != null  and deptId != ''">and s.dept_id = #{deptId}</if>
+        <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+        <if test="progress != null  and progress != ''">and find_in_set(s.progress , #{progress})</if>
+        <if test="xmStatus != null  and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
+        <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            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 != ''"><!-- 结束时间检索 -->
+            AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+
+        )d
+
         order by d.create_time desc
     </select>
     <select id="ldpsList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
@@ -665,7 +732,7 @@
         order by create_time desc
     </select>
 
-    <select id="selectZsyzSbbzbListYz" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
+    <select id="selectZsyzSbbzbListYz" resultMap="ZsyzSbbzbResult">
         select s.id,
         s.sbdw,
         s.tbrq,