MMF 2026-04-15 调度专家修改

qianhe-ydsj/src/main/java/com/qianhe/zqbf/controller/ZqczXmzDdzjController.java

@@ -2,14 +2,17 @@ package com.qianhe.zqbf.controller;
 
 
 import com.qianhe.common.core.controller.BaseController;
 import com.qianhe.common.core.controller.BaseController;
 import com.qianhe.common.core.domain.AjaxResult;
 import com.qianhe.common.core.domain.AjaxResult;
+import com.qianhe.common.exception.BusinessException;
+import com.qianhe.zqbf.domain.ZqbfXmzBfxm;
+import com.qianhe.zqbf.domain.ZqbfXmzBfzj;
 import com.qianhe.zqbf.domain.ZqczXmzBfjlQuery;
 import com.qianhe.zqbf.domain.ZqczXmzBfjlQuery;
 import com.qianhe.zqbf.domain.ZqczXmzDdzj;
 import com.qianhe.zqbf.domain.ZqczXmzDdzj;
 import com.qianhe.zqbf.service.ZqczXmzDdzjService;
 import com.qianhe.zqbf.service.ZqczXmzDdzjService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 @Slf4j
 @Slf4j
 @RestController
 @RestController
@@ -30,4 +33,20 @@ public class ZqczXmzDdzjController extends BaseController {
             return error(e.getMessage());
             return error(e.getMessage());
         }
         }
     }
     }
+
+    /**
+     * 新增
+     */
+    @PostMapping
+    public AjaxResult batchAdd(@RequestBody List<ZqbfXmzBfzj> xmzBfzjList) {
+        try {
+            return toAjax(xmzDdzjService.batchAdd(xmzBfzjList));
+        } catch (BusinessException e) {
+            log.warn("最强帮扶-调度专家-新增失败：" + e.getMessage());
+            return warn(e.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return error(e.getMessage());
+        }
+    }
 }
 }

qianhe-ydsj/src/main/java/com/qianhe/zqbf/domain/ZqbfXmzBfzj.java

@@ -19,6 +19,15 @@ public class ZqbfXmzBfzj implements Serializable {
      * 专家ID
      * 专家ID
      */
      */
     private Long zjid;
     private Long zjid;
+    private Long ddzj;
+    /**
+     * 需求ID
+     */
+    private Long xqid;
+    /**
+     * 负责人
+     */
+    private String fzr;
     /**
     /**
      * 绑定系统用户
      * 绑定系统用户
      */
      */

qianhe-ydsj/src/main/java/com/qianhe/zqbf/domain/ZqczXmzDdzj.java

@@ -18,6 +18,14 @@ public class ZqczXmzDdzj implements Serializable {
      */
      */
     private Long ddid;
     private Long ddid;
     /**
     /**
+     * 单位ID
+     */
+    private Long dwid;
+    /**
+     * 单位名称
+     */
+    private String dwmc;
+    /**
      * 需求ID
      * 需求ID
      */
      */
     private Long xqid;
     private Long xqid;
@@ -26,11 +34,21 @@ public class ZqczXmzDdzj implements Serializable {
      */
      */
     private Long ddzj;
     private Long ddzj;
     /**
     /**
-     * 负责人 1=是 2=否
+     * 专家名称
      */
      */
     private String zjmc;
     private String zjmc;
     /**
     /**
+     * 联系方式
+     */
+    private String sjh;
+    /**
      * 负责人 1=是 2=否
      * 负责人 1=是 2=否
      */
      */
     private String fzr;
     private String fzr;
+
+    public ZqczXmzDdzj(ZqbfXmzBfzj zqbfXmzBfzj){
+        this.xqid = zqbfXmzBfzj.getXqid();
+        this.ddzj = zqbfXmzBfzj.getZjid() != null ? zqbfXmzBfzj.getZjid() : zqbfXmzBfzj.getDdzj();
+        this.fzr = zqbfXmzBfzj.getFzr();
+    }
 }
 }

qianhe-ydsj/src/main/java/com/qianhe/zqbf/service/ZqczXmzDdzjService.java

 package com.qianhe.zqbf.service;
 package com.qianhe.zqbf.service;
 
 
+import com.qianhe.zqbf.domain.ZqbfXmzBfzj;
 import com.qianhe.zqbf.domain.ZqczXmzDdzj;
 import com.qianhe.zqbf.domain.ZqczXmzDdzj;
 
 
 import java.util.List;
 import java.util.List;
@@ -9,4 +10,6 @@ public interface ZqczXmzDdzjService {
      * 条件查询
      * 条件查询
      */
      */
     List<ZqczXmzDdzj> list(ZqczXmzDdzj zqczXmzDdzj);
     List<ZqczXmzDdzj> list(ZqczXmzDdzj zqczXmzDdzj);
+
+    int batchAdd(List<ZqbfXmzBfzj> xmzBfzjList);
 }
 }

qianhe-ydsj/src/main/java/com/qianhe/zqbf/service/impl/ZqczXmzDdzjServiceImpl.java

 package com.qianhe.zqbf.service.impl;
 package com.qianhe.zqbf.service.impl;
 
 
+import com.qianhe.common.exception.BusinessException;
+import com.qianhe.zqbf.domain.ZqbfXmzBfzj;
 import com.qianhe.zqbf.domain.ZqczXmzDdzj;
 import com.qianhe.zqbf.domain.ZqczXmzDdzj;
 import com.qianhe.zqbf.mapper.ZqczXmzDdzjMapper;
 import com.qianhe.zqbf.mapper.ZqczXmzDdzjMapper;
 import com.qianhe.zqbf.service.ZqczXmzDdzjService;
 import com.qianhe.zqbf.service.ZqczXmzDdzjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 
 
 @Service
 @Service
 public class ZqczXmzDdzjServiceImpl implements ZqczXmzDdzjService {
 public class ZqczXmzDdzjServiceImpl implements ZqczXmzDdzjService {
@@ -21,4 +26,26 @@ public class ZqczXmzDdzjServiceImpl implements ZqczXmzDdzjService {
         List<ZqczXmzDdzj> dataList = ddzjMapper.list(zqczXmzDdzj);
         List<ZqczXmzDdzj> dataList = ddzjMapper.list(zqczXmzDdzj);
         return dataList;
         return dataList;
     }
     }
+
+    @Transactional
+    @Override
+    public int batchAdd(List<ZqbfXmzBfzj> xmzBfzjList) {
+        if (Optional.ofNullable(xmzBfzjList).orElse(Collections.emptyList()).isEmpty()) {
+            return 0;
+        }
+        Long xqid = xmzBfzjList.get(0).getXqid();
+        ddzjMapper.delete(xqid);
+
+        List<ZqczXmzDdzj> dataList = new ArrayList<>();
+        int count = 0;
+        for (ZqbfXmzBfzj zqbfXmzBfzj : xmzBfzjList) {
+            if ("1".equals(zqbfXmzBfzj.getFzr())) count += 1;
+            dataList.add(new ZqczXmzDdzj(zqbfXmzBfzj));
+        }
+        if (count != 1) {
+            throw new BusinessException("必须指定一个负责人");
+        }
+        ddzjMapper.batchAdd(dataList);
+        return 1;
+    }
 }
 }

qianhe-ydsj/src/main/resources/mapper/zqbf/ZqczXmzDdzjMapper.xml

@@ -6,21 +6,29 @@
     <!--  返回实体  -->
     <!--  返回实体  -->
     <resultMap id="ZqczXmzDdzjResult" type="ZqczXmzDdzj">
     <resultMap id="ZqczXmzDdzjResult" type="ZqczXmzDdzj">
         <result property="ddid" column="ddid"/>
         <result property="ddid" column="ddid"/>
+        <result property="dwid" column="dwid"/>
+        <result property="dwmc" column="dwmc"/>
         <result property="xqid" column="xqid"/>
         <result property="xqid" column="xqid"/>
         <result property="ddzj" column="ddzj"/>
         <result property="ddzj" column="ddzj"/>
         <result property="zjmc" column="zjmc"/>
         <result property="zjmc" column="zjmc"/>
+        <result property="sjh" column="sjh"/>
         <result property="fzr" column="fzr"/>
         <result property="fzr" column="fzr"/>
     </resultMap>
     </resultMap>
     <!--  通用查询  -->
     <!--  通用查询  -->
     <sql id="selectCommon">
     <sql id="selectCommon">
         SELECT
         SELECT
             ddzj.ddid,
             ddzj.ddid,
+            bfzj.dwid,
+            CONCAT( dept.dept_name, dept.create_by ) AS dwmc,
             ddzj.xqid,
             ddzj.xqid,
             ddzj.ddzj,
             ddzj.ddzj,
             bfzj.zjmc,
             bfzj.zjmc,
+            bfzj.sjh,
             ddzj.fzr
             ddzj.fzr
         FROM
         FROM
-            zqcz_xmz_ddzj ddzj LEFT JOIN zqbf_xmz_bfzj bfzj ON ddzj.ddzj=bfzj.zjid
+            zqcz_xmz_ddzj ddzj
+            LEFT JOIN zqbf_xmz_bfzj bfzj ON ddzj.ddzj = bfzj.zjid
+            LEFT JOIN sys_dept dept ON bfzj.dwid = dept.dept_id
     </sql>
     </sql>
     <!--  条件查询  -->
     <!--  条件查询  -->
     <select id="list" parameterType="ZqczXmzDdzj" resultMap="ZqczXmzDdzjResult">
     <select id="list" parameterType="ZqczXmzDdzj" resultMap="ZqczXmzDdzjResult">