新增 分发要素部门中间表新增是否回复的字段

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

@@ -98,6 +98,19 @@ public class ZsyzSbbzbController extends BaseController
         return toAjax(zsyzSbbzbService.updateZsyzSbbzb(zsyzSbbzb));
     }
 
+
+
+    /**
+     *招商引资_申报_首谈信息_主 是否需要会议支持(专班跟进)
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:meet')")
+    @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.UPDATE)
+    @PostMapping("/meet")
+    public AjaxResult meet(@RequestBody ZsyzSbbzb zsyzSbbzb)
+    {
+        return toAjax(zsyzSbbzbService.updateZsyzSbbzbMeet(zsyzSbbzb));
+    }
+
     /**
      * 删除招商引资_申报_首谈信息_主
      */

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzSbbzbMapper.java

@@ -50,6 +50,7 @@ public interface ZsyzSbbzbMapper
      * @return 结果
      */
     public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb);
+    public int updateZsyzSbbzbMeet(ZsyzSbbzb zsyzSbbzb);
     public int updateZsyzSbbzbCjd(ZsyzSbbzb zsyzSbbzb);
     //线索暂存/终止接口
     public int updateZsyzSbbzbForZc(ZsyzSbbzb zsyzSbbzb);

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

@@ -46,13 +46,12 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      */
     @Override
     @Transactional
-    public ZsyzSbbzb selectZsyzSbbzbById(Long id)
-    {
+    public ZsyzSbbzb selectZsyzSbbzbById(Long id) {
         ZsyzSbbzb zsyzSbbzb = zsyzSbbzbMapper.selectZsyzSbbzbById(id);
         ZsyzFj zsyzFj = new ZsyzFj();
         zsyzFj.setSourceId(id);
         List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        if (zsyzFjList != null && zsyzFjList.size() > 0){
+        if (zsyzFjList != null && zsyzFjList.size() > 0) {
             zsyzSbbzb.setZsyzFjList(zsyzFjList);
         }
         return zsyzSbbzb;
@@ -78,8 +77,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      */
     @Override
     @Transactional
-    public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
-    {
+    public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
         //获取当前人员信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         zsyzSbbzb.setCreateTime(DateUtils.getNowDate());
@@ -95,8 +93,8 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
             zsyzFjMapper.insertZsyzFj(zsyzFj);
         }
         //将项目投资方-自然人、企业两张表赋值项目ID
-        xmProjectPersionMapper.updateXmProjectPersionByXmbh(zsyzSbbzb.getId(),zsyzSbbzb.getXmbh());
-        xmProjectInvestorMapper.updateXmProjectInvestorByXmbh(zsyzSbbzb.getId(),zsyzSbbzb.getXmbh());
+        xmProjectPersionMapper.updateXmProjectPersionByXmbh(zsyzSbbzb.getId(), zsyzSbbzb.getXmbh());
+        xmProjectInvestorMapper.updateXmProjectInvestorByXmbh(zsyzSbbzb.getId(), zsyzSbbzb.getXmbh());
         return count;
     }
 
@@ -108,13 +106,12 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      */
     @Override
     @Transactional
-    public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
-    {
+    public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
 
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         int count = zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
         //修改附件
-        if(zsyzSbbzb.getZsyzFjList()!=null && zsyzSbbzb.getZsyzFjList().size()>0){
+        if (zsyzSbbzb.getZsyzFjList() != null && zsyzSbbzb.getZsyzFjList().size() > 0) {
             //先删除相关附件
             zsyzFjMapper.deleteZsyzFjBySourceId(zsyzSbbzb.getId());
             //再将文件新增进数据库
@@ -131,6 +128,17 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         return count;
     }
 
+    /**
+     * 专班跟进
+     *
+     * @param zsyzSbbzb
+     * @return
+     */
+    @Override
+    public int updateZsyzSbbzbMeet(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzSbbzbMapper.updateZsyzSbbzbMeet(zsyzSbbzb);
+    }
+
     /**
      * 更新承接地信息
      *

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

@@ -11,6 +11,7 @@ import com.ruoyi.system.service.projectV2.IZsyzShyjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -59,6 +60,7 @@ public class ZsyzShyjServiceImpl implements IZsyzShyjService
     @DataScope(deptAlias = "s")
     public List<ZsyzShyj> selectZsyzShyjListByWt(ZsyzShyj zsyzShyj) {
         List<ZsyzShyj> zsyzShyjs = zsyzShyjMapper.selectZsyzShyjListByWt(zsyzShyj);
+        zsyzShyjs.removeAll(Collections.singleton(null));
         return zsyzShyjs;
     }
 

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

@@ -76,7 +76,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         if (roles != null && roles.size() > 0){
             for (SysRole role : roles) {
                 if (SZBM.equals(role.getRoleKey())){
-                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept()
+                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
                     zsyzProjectDept.setXmId(zsyzShyj.getXmId());
                     zsyzProjectDept.setDeptId(dept.getDeptId());
                     projectDeptService.updateZsyzProjectDeptByXmId(zsyzProjectDept);

ruoyi-system/src/main/java/com/ruoyi/system/service/projectV2/IZsyzSbbzbService.java

@@ -43,6 +43,8 @@ public interface IZsyzSbbzbService
      * @return 结果
      */
     public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb);
+    //专班跟进
+    public int updateZsyzSbbzbMeet(ZsyzSbbzb zsyzSbbzb);
 
     //更新承接地信息
     public int updateZsyzSbbzbCjd(ZsyzSbbzb zsyzSbbzb);

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

@@ -777,6 +777,11 @@
         set progress = #{progress}
         where id = #{id}
     </update>
+    <update id="updateZsyzSbbzbMeet" parameterType="ZsyzSbbzb">
+        update zsyz_sbbzb
+        set is_meet = #{isMeet}
+        where id = #{id}
+    </update>
 
     <delete id="deleteZsyzSbbzbById" parameterType="Long">
         delete