MMF 2026-03-25 直属任务模块优化

qianhe-ydsj/src/main/java/com/qianhe/zqcz/jcdw/mapper/ZqczJcdwMapper.java

@@ -5,6 +5,7 @@ import com.qianhe.zqcz.jcdw.domain.ZqczJcdw;
 import com.qianhe.zqcz.jcdw.domain.ZqczJcdwQuery;
 import com.qianhe.zqcz.jcdw.domain.ZqczJcdwVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -43,5 +44,10 @@ public interface ZqczJcdwMapper {
     /**
      * 通过直属任务ID删除
      */
-    int deleteByZsrwid(Long zsrwid);
+    int deleteByZsrwid(@Param("zsrwid") Long zsrwid);
+
+    /**
+     * 通过直属任务ID删除
+     */
+    int deleteByZsrwids(@Param("zsrwids") Long[] zsrwids);
 }

qianhe-ydsj/src/main/java/com/qianhe/zqcz/jcrw/mapper/ZqczJcrwMapper.java

@@ -48,5 +48,7 @@ public interface ZqczJcrwMapper {
     /**
      * 根据直属任务ID 删除
      */
-    int deleteByZsrwid(Long zsrwid);
+    int deleteByZsrwid(@Param("zsrwid") Long zsrwid);
+
+    int deleteByZsrwids(@Param("zsrwids") Long[] zsrwids);
 }

qianhe-ydsj/src/main/java/com/qianhe/zqcz/pftb/service/impl/ZqczPftbServiceImpl.java

@@ -44,12 +44,12 @@ public class ZqczPftbServiceImpl implements ZqczPftbService {
 
         // 根据基层任务ID查询评委信息
         List<ZqczPwxxVo> pwxxList = zqczPwxxMapper.list(ZqczPwxxQuery.builder().jcrwid(zqczPftbQuery.getJcrwid()).build());
-        if (!Optional.ofNullable(pwxxList).orElse(Collections.emptyList()).isEmpty()) {
-            zqczPftbQuery.setPwxxList(pwxxList);
+        if (Optional.ofNullable(pwxxList).orElse(Collections.emptyList()).isEmpty()) {
+            throw new BusinessException("评委信息未填报");
         }
 
+        zqczPftbQuery.setPwxxList(pwxxList);
         List<Map<String, Object>> dataList = zqczPftbMapper.list(zqczPftbQuery);
-
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("dataList", dataList);
         dataMap.put("fields", pwxxList);

qianhe-ydsj/src/main/java/com/qianhe/zqcz/ryxx/service/impl/ZqczRyxxServiceImpl.java

@@ -119,7 +119,7 @@ public class ZqczRyxxServiceImpl implements ZqczRyxxService {
                 // 分类（C列）
                 String ryflName = new DataFormatter().formatCellValue(row.getCell(2)).trim();
                 String ryfl = MtConstant.ZQCZ_RYLX_MAP.get(ryflName);
-                if (StringUtils.isEmpty(rymc)) {
+                if (StringUtils.isEmpty(ryfl)) {
                     throw new BusinessException("导入失败，第" + (i + 1) + "行，分类必须为'领导班子'、'三室一中心'、'班站'");
                 }
                 // 封装数据

qianhe-ydsj/src/main/java/com/qianhe/zqcz/xmgl/domain/ZqczXmgl.java

@@ -37,7 +37,7 @@ public class ZqczXmgl extends BaseEntity {
     /**
      * 工作场景码表：采油 zqcz_cyzy_gzcj，集输 zqcz_jszy_gzcj
      * zqcz_cyzy_gzcj： 1 - 应急处置 | 2 - 巡检处置 | 3 - 维护保养 | 4 - 措施执行 | 5 - 资料化验 | 6 - 页岩油 | 7 - 注水站
-     * zqcz_jszy_gzcj：1 - 集输运行 | 2 - 集输化验 | 3 - 集输维护保养 | 4 - 注水站 | 5 - 应急处置 | 6 - 集输、CCUS 处理站 | 7 - CCUS 处理站维护保养
+     * zqcz_jszy_gzcj：1 - 集输运行 | 2 - 集输化验 | 3 - 集输维护保养 | 4 - 注水站 | 5 - 应急处置 | 6 - 集输、CCUS处理站 | 7 - CCUS 处理站维护保养
      */
     private String gzcj;
     /**

qianhe-ydsj/src/main/java/com/qianhe/zqcz/zsrw/service/impl/ZqczZsrwServiceImpl.java

 package com.qianhe.zqcz.zsrw.service.impl;
 
+import com.qianhe.zqcz.jcdw.mapper.ZqczJcdwMapper;
+import com.qianhe.zqcz.jcrw.mapper.ZqczJcrwMapper;
 import com.qianhe.zqcz.zsrw.domain.ZqczZsrw;
 import com.qianhe.zqcz.zsrw.domain.ZqczZsrwQuery;
 import com.qianhe.zqcz.zsrw.domain.ZqczZsrwVo;
@@ -7,6 +9,7 @@ import com.qianhe.zqcz.zsrw.mapper.ZqczZsrwMapper;
 import com.qianhe.zqcz.zsrw.service.ZqczZsrwService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
 import java.util.Date;
@@ -16,6 +19,10 @@ import java.util.List;
 public class ZqczZsrwServiceImpl implements ZqczZsrwService {
     @Autowired
     private ZqczZsrwMapper zqczZsrwMapper;
+    @Autowired
+    private ZqczJcdwMapper zqczJcdwMapper;
+    @Autowired
+    private ZqczJcrwMapper zqczJcrwMapper;
 
     /**
      * 分页查询
@@ -58,8 +65,12 @@ public class ZqczZsrwServiceImpl implements ZqczZsrwService {
     /**
      * 删除
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int delete(Long[] ids) {
-        return zqczZsrwMapper.delete(ids);
+        zqczZsrwMapper.delete(ids);  // 删除直属任务
+        zqczJcdwMapper.deleteByZsrwids(ids);  // 删除基层单位
+        zqczJcrwMapper.deleteByZsrwids(ids);  // 删除基层任务
+        return 1;
     }
 }

qianhe-ydsj/src/main/resources/mapper/zqcz/jcdw/ZqczJcdwMapper.xml

@@ -91,4 +91,11 @@
     <delete id="deleteByZsrwid" parameterType="long">
         DELETE FROM zqcz_jcdw WHERE zsrwid = #{zsrwid}
     </delete>
+    <!--  删除  -->
+    <delete id="deleteByZsrwids" parameterType="long">
+        DELETE FROM zqcz_jcdw WHERE zsrwid IN
+        <foreach item="id" collection="zsrwids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

qianhe-ydsj/src/main/resources/mapper/zqcz/jcrw/ZqczJcrwMapper.xml

@@ -153,4 +153,11 @@
     <delete id="deleteByZsrwid" parameterType="long">
         DELETE FROM zqcz_jcrw WHERE ZSRWID = #{jcdwid}
     </delete>
+    <!--  删除  -->
+    <delete id="deleteByZsrwids" parameterType="long">
+        DELETE FROM zqcz_jcrw WHERE ZSRWID IN
+        <foreach item="id" collection="zsrwids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>
\ No newline at end of file

qianhe-ydsj/src/main/resources/mapper/zqcz/pftb/ZqczPftbMapper.xml

@@ -15,7 +15,7 @@
             lsjl.dwmc,
             lsjl.jcdwid,
             jcdw.jcdwmc,
-            lsjl.update_time,
+            lsjl.CREATE_TIME AS update_time,
             IFNULL(lsjl.remark, '') AS remark,
             IFNULL(ROUND(pftb.pjdf, 5), '') AS pjdf,
             <foreach item="item" collection="pwxxList" separator=",">

qianhe-ydsj/src/main/resources/mapper/zqcz/zsrw/ZqczZsrwMapper.xml

@@ -37,7 +37,7 @@
             zqcz_zsrw zsrw
             LEFT JOIN sys_dept dept ON zsrw.dept_id = dept.dept_id
             LEFT JOIN (SELECT zsrwid, COUNT(*) AS glqsl FROM zqcz_jcdw GROUP BY zsrwid) jcdw_count ON zsrw.zsrwid = jcdw_count.zsrwid
-            LEFT JOIN ( SELECT zsrwid, COUNT(jcrwid) AS jcrwsl, SUM(CASE WHEN jcrwzt = '7' THEN 1 ELSE 0 END) AS jcrwwcsl FROM zqcz_jcrw GROUP BY zsrwid) jcrw_count ON zsrw.zsrwid = jcrw_count.zsrwid
+            LEFT JOIN ( SELECT zsrwid, COUNT(jcrwid) AS jcrwsl, SUM(CASE WHEN jcrwzt = '9' THEN 1 ELSE 0 END) AS jcrwwcsl FROM zqcz_jcrw GROUP BY zsrwid) jcrw_count ON zsrw.zsrwid = jcrw_count.zsrwid
     </sql>
     <!--  条件查询  -->
     <select id="list" parameterType="com.qianhe.zqcz.zsrw.domain.ZqczZsrwQuery" resultMap="ZqczZsrwResult">
@@ -50,7 +50,7 @@
             ${params.dataScope}
         </where>
         ORDER BY
-            zsrw.rwkssj DESC
+            zsrw.update_time DESC
     </select>
     <!--  查询详情  -->
     <select id="info" parameterType="long" resultMap="ZqczZsrwResult">