1.29修改

qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmServiceImpl.java

@@ -265,6 +265,11 @@ public class WorkXmServiceImpl implements IWorkXmService
      */
      */
     @Override
     @Override
     public int submitCjsj(WorkXm workXm) {
     public int submitCjsj(WorkXm workXm) {
+        //查询项目详情
+        WorkXm workXm1 = workXmMapper.selectWorkXmById(workXm.getId());
+        if (workXm1.getCjtjzt().equals("0")){
+            throw new ServiceException("请先填报后上传！");
+        }
         //修改该项目为第三节点
         //修改该项目为第三节点
         workXm.setCjtjzt("3");
         workXm.setCjtjzt("3");
         workXm.setLczt("2");
         workXm.setLczt("2");

qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmcbServiceImpl.java

@@ -316,6 +316,7 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
             workXm.setId(id);
             workXm.setId(id);
             workXm.setLczt("1");
             workXm.setLczt("1");
             workXm.setDqjdmc("采集设计");
             workXm.setDqjdmc("采集设计");
+            workXm.setCjtjzt("4");
             num = workXmMapper.updateWorkXm(workXm);
             num = workXmMapper.updateWorkXm(workXm);
             //查询项目详情
             //查询项目详情
 //            WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
 //            WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
@@ -371,6 +372,7 @@ public class WorkXmcbServiceImpl implements IWorkXmcbService
             workXm.setId(id);
             workXm.setId(id);
             workXm.setLczt("1");
             workXm.setLczt("1");
             workXm.setDqjdmc("采集设计");
             workXm.setDqjdmc("采集设计");
+            workXm.setCjtjzt("4");
             num = workXmMapper.updateWorkXm(workXm);
             num = workXmMapper.updateWorkXm(workXm);
 //            //查询项目详情
 //            //查询项目详情
 //            WorkXm workXm1 = workXmMapper.selectWorkXmById(id);
 //            WorkXm workXm1 = workXmMapper.selectWorkXmById(id);

qianhe-gzpt/src/main/resources/mapper/WorkXmcbMapper.xml

@@ -118,7 +118,7 @@
         FROM work_xm x
         FROM work_xm x
         LEFT JOIN work_xmcb w ON w.yltz_id = x.id
         LEFT JOIN work_xmcb w ON w.yltz_id = x.id
         <where>
         <where>
-            x.del_flag = '0' AND w.del_flag = '0' and x.tjzt = '1' and cjtjzt = '3'
+            x.del_flag = '0' AND w.del_flag = '0' and x.tjzt = '1'
             <if test="userId != null"> and w.shr_id = #{userId}</if>
             <if test="userId != null"> and w.shr_id = #{userId}</if>
             <if test="state != null and state != '' and state == 1"> and w.wczt = #{state} and w.sfsctj = '0'</if>
             <if test="state != null and state != '' and state == 1"> and w.wczt = #{state} and w.sfsctj = '0'</if>
             <if test="jh != null and jh != ''">and x.jh = #{jh}</if>
             <if test="jh != null and jh != ''">and x.jh = #{jh}</if>
@@ -127,6 +127,7 @@
                 <foreach item="jdmc" collection="jdmc" open="(" separator="," close=")">
                 <foreach item="jdmc" collection="jdmc" open="(" separator="," close=")">
                     #{jdmc}
                     #{jdmc}
                 </foreach>
                 </foreach>
+                and cjtjzt = '3'
             </if>
             </if>
         </where>
         </where>
         GROUP BY x.id
         GROUP BY x.id