fix 新增签约信息可能会重复的问题

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

@@ -94,13 +94,22 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertZsyzKgxx(ZsyzKgxx zsyzKgxx) {
-        zsyzKgxx.setCreateTime(DateUtils.getNowDate());
-        int count = zsyzKgxxMapper.insertZsyzKgxx(zsyzKgxx);
         //先去判断项目状态
         ZsyzSbbzb zsyzSbbzb = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzKgxx.getXmId());
         if (zsyzSbbzb == null || (!THR.equals(zsyzSbbzb.getProgress()) && !TWO.equals(zsyzSbbzb.getXmStatus()))) {
             return 0;
         }
+        ZsyzKgxx zsyzKgxxNew = new ZsyzKgxx();
+        zsyzKgxxNew.setXmId(zsyzKgxx.getXmId());
+        zsyzKgxxNew.setXmbh(zsyzKgxx.getXmbh());
+        //先去查询是否有重复的项目id
+        List<ZsyzKgxx> zsyzKgxxes = zsyzKgxxMapper.selectZsyzKgxxList(zsyzKgxxNew);
+        if (zsyzKgxxes != null &&  zsyzKgxxes.size() > 0){
+            return 0;
+        }
+        zsyzKgxx.setCreateTime(DateUtils.getNowDate());
+        int count = zsyzKgxxMapper.insertZsyzKgxx(zsyzKgxx);
+
         zsyzSbbzb.setProgress(FOR);
         zsyzSbbzb.setXmStatus(ONE);
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());

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

@@ -105,7 +105,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         zsyzQyxxNew.setXmbh(zsyzQyxx.getXmbh());
         //先去查询是否有重复的项目id
         List<ZsyzQyxx> zsyzQyxxes = zsyzQyxxMapper.selectZsyzQyxxList(zsyzQyxxNew);
-        if (zsyzQyxxes != null){
+        if (zsyzQyxxes != null &&  zsyzQyxxes.size() > 0){
             return 0;
         }
         zsyzSbbzb.setProgress(THR);
@@ -175,14 +175,14 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateZsyzQyxx(ZsyzQyxx zsyzQyxx) {
-        zsyzQyxx.setUpdateBy(SecurityUtils.getLoginUser().getUser().getDept().getDeptName());
-        zsyzQyxx.setUpdateTime(DateUtils.getNowDate());
-        int count = zsyzQyxxMapper.updateZsyzQyxx(zsyzQyxx);
         //先去判断项目状态
         ZsyzSbbzb zsyzSbbzb = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzQyxx.getXmId());
         if (zsyzSbbzb == null || (!THR.equals(zsyzSbbzb.getProgress()) && TWO.equals(zsyzSbbzb.getXmStatus()))){
             return 0;
         }
+        zsyzQyxx.setUpdateBy(SecurityUtils.getLoginUser().getUser().getDept().getDeptName());
+        zsyzQyxx.setUpdateTime(DateUtils.getNowDate());
+        int count = zsyzQyxxMapper.updateZsyzQyxx(zsyzQyxx);
         zsyzSbbzb.setProgress(THR);
         zsyzSbbzb.setXmStatus(ONE);
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());

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

@@ -93,14 +93,22 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertZsyzTcxx(ZsyzTcxx zsyzTcxx) {
-
-        zsyzTcxx.setCreateTime(DateUtils.getNowDate());
-        int count = zsyzTcxxMapper.insertZsyzTcxx(zsyzTcxx);
         //先去判断项目状态
         ZsyzSbbzb zsyzSbbzb = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzTcxx.getXmId());
         if (zsyzSbbzb == null || (!FOR.equals(zsyzSbbzb.getProgress()) && !TWO.equals(zsyzSbbzb.getXmStatus()))) {
             return 0;
         }
+        ZsyzTcxx zsyzTcxxNew = new ZsyzTcxx();
+        zsyzTcxxNew.setXmId(zsyzTcxx.getXmId());
+        zsyzTcxxNew.setXmbh(zsyzTcxx.getXmbh());
+        //先去查询是否有重复的项目id
+        List<ZsyzTcxx> zsyzTcxxes = zsyzTcxxMapper.selectZsyzTcxxList(zsyzTcxxNew);
+        if (zsyzTcxxes != null &&  zsyzTcxxes.size() > 0){
+            return 0;
+        }
+        zsyzTcxx.setCreateTime(DateUtils.getNowDate());
+        int count = zsyzTcxxMapper.insertZsyzTcxx(zsyzTcxx);
+
         zsyzSbbzb.setProgress(FIV);
         zsyzSbbzb.setXmStatus(ONE);
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());

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

@@ -44,18 +44,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
+<!--    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
         select ANY_VALUE(a.id) as id, ANY_VALUE(a.xm_id) as xm_id, ANY_VALUE(a.xmbh) as xmbh, ANY_VALUE(a.xmmc)as xmmc,
                ANY_VALUE(a.dept_id) as dept_id, ANY_VALUE(a.dept_name) as dept_name, ANY_VALUE(MAX(a.cl_time)) as cl_time, ANY_VALUE(a.progress) as progress, ANY_VALUE(a.xm_status) as xm_status
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress, xm_status
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>
+    </select>-->
 
-    <!--<select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
         select id, xm_id, xmbh, xmmc,dept_id, dept_name, MAX(cl_time) as cl_time, progress, xm_status
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time , progress, xm_status
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>-->
+    </select>
 
     <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_lcjl