修改,查询主表不连查

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

@@ -37,7 +37,6 @@ public class ZsyzSbbzbController extends BaseController
     public TableDataInfo list(ZsyzSbbzb zsyzSbbzb)
     {
         long count = zsyzSbbzbService.selectZsyzSbbzbListCount(zsyzSbbzb);
-        startPage();
         List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbList(zsyzSbbzb);
         return getDataTable(list,count);
     }
@@ -92,7 +91,6 @@ public class ZsyzSbbzbController extends BaseController
     /**
      * 修改招商引资_申报_首谈信息_主
      */
-    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:edit')")
     @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzSbbzb zsyzSbbzb)

ruoyi-system/src/main/java/com/ruoyi/system/domain/projectV2/ZsyzSbbzb.java

@@ -189,6 +189,11 @@ public class ZsyzSbbzb extends BaseEntity
     //@Excel(name = "会议申请备注")
     private String meetRemark;
 
+    /**
+     * 最新的审核进度
+     */
+    private String shjg;
+
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
 
@@ -269,6 +274,13 @@ public class ZsyzSbbzb extends BaseEntity
     })
     private ZsyzTcxx zsyzTcxx;*/
 
+    public String getShjg() {
+        return shjg;
+    }
+
+    public void setShjg(String shjg) {
+        this.shjg = shjg;
+    }
 
     public List<ZsyzShyj> getShyjList() {
         return shyjList;
@@ -748,6 +760,7 @@ public class ZsyzSbbzb extends BaseEntity
             .append("isMeet", getIsMeet())
             .append("meetRemark", getMeetRemark())
             .append("shyjList", getShyjList())
+            .append("shjg", getShjg())
             .toString();
     }
 }

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

@@ -4,8 +4,10 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
 import com.ruoyi.system.domain.projectV2.ZsyzKgxx;
 import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
+import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzKgxxMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.service.projectV2.IZsyzKgxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,6 +15,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static com.ruoyi.common.constant.CommonConstants.*;
+
 /**
  * 招商引资_开工信息Service业务层处理
  * 
@@ -28,6 +32,8 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
     @Autowired
     private ZsyzFjMapper zsyzFjMapper;
 
+    @Autowired
+    private ZsyzSbbzbMapper zsyzSbbzbMapper;
     /**
      * 查询招商引资_开工信息
      * 
@@ -39,14 +45,15 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
     public ZsyzKgxx selectZsyzKgxxById(Long id)
     {
         ZsyzKgxx zsyzKgxx = zsyzKgxxMapper.selectZsyzKgxxById(id);
-        ZsyzFj zsyzFj = new ZsyzFj();
-        zsyzFj.setSourceId(id);
-        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        if (zsyzFjList != null && zsyzFjList.size() > 0){
-            zsyzKgxx.setZsyzFjList(zsyzFjList);
+        if (zsyzKgxx != null){
+            ZsyzFj zsyzFj = new ZsyzFj();
+            zsyzFj.setSourceId(id);
+            List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+            if (zsyzFjList != null && zsyzFjList.size() > 0){
+                zsyzKgxx.setZsyzFjList(zsyzFjList);
+            }
         }
         return zsyzKgxx;
-
     }
 
     /**
@@ -73,6 +80,10 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
     {
         zsyzKgxx.setCreateTime(DateUtils.getNowDate());
         int count = zsyzKgxxMapper.insertZsyzKgxx(zsyzKgxx);
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzKgxx.getXmId());
+        zsyzSbbzb.setProgress(EIG);
+        zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzKgxx.getZsyzFjList();
         for (ZsyzFj zsyzFj : zsyzFjList) {
@@ -98,6 +109,13 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
 
         zsyzKgxx.setUpdateTime(DateUtils.getNowDate());
         int count = zsyzKgxxMapper.updateZsyzKgxx(zsyzKgxx);
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzKgxx.getXmId());
+        ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzKgxx.getXmId());
+        if (zsyzSbbzbOld != null && zsyzSbbzbOld.getProgress().equals(SEV)){
+            zsyzSbbzb.setProgress(EIG);
+            zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+        }
         //修改附件
         if(zsyzKgxx.getZsyzFjList()!=null && zsyzKgxx.getZsyzFjList().size()>0){
             //先删除相关附件

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

@@ -78,8 +78,7 @@ public class ZsyzProjectDeptServiceImpl implements IZsyzProjectDeptService
      */
     @Override
     public int updateZsyzProjectDeptByXmId(ZsyzProjectDept zsyzProjectDept) {
-        zsyzProjectDeptMapper.updateZsyzProjectDeptByXmId(zsyzProjectDept);
-        return 0;
+        return   zsyzProjectDeptMapper.updateZsyzProjectDeptByXmId(zsyzProjectDept);
     }
 
     /**

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

@@ -3,8 +3,10 @@ package com.ruoyi.system.service.impl.projectV2;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
 import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
+import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzQyxxMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.service.projectV2.IZsyzQyxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,6 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static com.ruoyi.common.constant.CommonConstants.FIV;
+import static com.ruoyi.common.constant.CommonConstants.SIX;
+
 /**
  * 招商引资_签约信息Service业务层处理
  *
@@ -25,6 +30,8 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
 
     @Autowired
     private ZsyzFjMapper zsyzFjMapper;
+    @Autowired
+    private ZsyzSbbzbMapper zsyzSbbzbMapper;
 
     /**
      * 查询招商引资_签约信息
@@ -67,8 +74,11 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
     @Override
     @Transactional
     public int insertZsyzQyxx(ZsyzQyxx zsyzQyxx) {
-
         zsyzQyxx.setCreateTime(DateUtils.getNowDate());
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzQyxx.getXmId());
+        zsyzSbbzb.setProgress(SIX);
+        zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         int count = zsyzQyxxMapper.insertZsyzQyxx(zsyzQyxx);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzQyxx.getZsyzFjList();
@@ -90,11 +100,18 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int updateZsyzQyxx(ZsyzQyxx zsyzQyxx) {
 
         zsyzQyxx.setUpdateTime(DateUtils.getNowDate());
         int count = zsyzQyxxMapper.updateZsyzQyxx(zsyzQyxx);
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzQyxx.getXmId());
+        ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzQyxx.getXmId());
+        if (zsyzSbbzbOld != null && zsyzSbbzbOld.getProgress().equals(FIV)){
+            zsyzSbbzb.setProgress(SIX);
+            zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+        }
         //修改附件
         if (zsyzQyxx.getZsyzFjList() != null && zsyzQyxx.getZsyzFjList().size() > 0) {
             //先删除相关附件

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

@@ -48,11 +48,13 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Transactional
     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) {
-            zsyzSbbzb.setZsyzFjList(zsyzFjList);
+        if (zsyzSbbzb != null){
+            ZsyzFj zsyzFj = new ZsyzFj();
+            zsyzFj.setSourceId(id);
+            List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+            if (zsyzFjList != null && zsyzFjList.size() > 0) {
+                zsyzSbbzb.setZsyzFjList(zsyzFjList);
+            }
         }
         return zsyzSbbzb;
     }
@@ -66,7 +68,8 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Override
     @DataScope(deptAlias = "s")
     public List<ZsyzSbbzb> selectZsyzSbbzbList(ZsyzSbbzb zsyzSbbzb) {
-        return zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
+        List<ZsyzSbbzb> zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
+        return zsyzSbbzbs;
     }
 
     /**
@@ -85,12 +88,14 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         int count = zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzSbbzb.getZsyzFjList();
-        for (ZsyzFj zsyzFj : zsyzFjList) {
-            zsyzFj.setSourceId(zsyzSbbzb.getId());
-            zsyzFj.setType("1");
-            zsyzFj.setXmId(zsyzSbbzb.getId());
-            zsyzFj.setXmbh(zsyzSbbzb.getXmbh());
-            zsyzFjMapper.insertZsyzFj(zsyzFj);
+        if (zsyzFjList != null){
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzSbbzb.getId());
+                zsyzFj.setType("1");
+                zsyzFj.setXmId(zsyzSbbzb.getId());
+                zsyzFj.setXmbh(zsyzSbbzb.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
         }
         //将项目投资方-自然人、企业两张表赋值项目ID
         xmProjectPersionMapper.updateXmProjectPersionByXmbh(zsyzSbbzb.getId(), zsyzSbbzb.getXmbh());

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

@@ -3,8 +3,10 @@ package com.ruoyi.system.service.impl.projectV2;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
 import com.ruoyi.system.domain.projectV2.ZsyzQyxx;
+import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.ZsyzTcxx;
 import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzTcxxMapper;
 import com.ruoyi.system.service.projectV2.IZsyzTcxxService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,68 +15,75 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static com.ruoyi.common.constant.CommonConstants.*;
+
 
 /**
  * 招商引资_投产信息Service业务层处理
- * 
+ *
  * @author boman
  * @date 2023-02-22
  */
 @Service
-public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
-{
+public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
     @Autowired
     private ZsyzTcxxMapper zsyzTcxxMapper;
 
     @Autowired
     private ZsyzFjMapper zsyzFjMapper;
 
+    @Autowired
+    private ZsyzSbbzbMapper zsyzSbbzbMapper;
+
     /**
      * 查询招商引资_投产信息
-     * 
+     *
      * @param id 招商引资_投产信息ID
      * @return 招商引资_投产信息
      */
     @Override
     @Transactional
-    public ZsyzTcxx selectZsyzTcxxById(Long id)
-    {
-
+    public ZsyzTcxx selectZsyzTcxxById(Long id) {
         ZsyzTcxx zsyzTcxx = zsyzTcxxMapper.selectZsyzTcxxById(id);
-        ZsyzFj zsyzFj = new ZsyzFj();
-        zsyzFj.setSourceId(id);
-        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        if (zsyzFjList != null && zsyzFjList.size() > 0){
-            zsyzTcxx.setZsyzFjList(zsyzFjList);
+        if (zsyzTcxx != null) {
+            ZsyzFj zsyzFj = new ZsyzFj();
+            zsyzFj.setSourceId(id);
+            List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+            if (zsyzFjList != null && zsyzFjList.size() > 0) {
+                zsyzTcxx.setZsyzFjList(zsyzFjList);
+            }
         }
         return zsyzTcxx;
     }
 
     /**
      * 查询招商引资_投产信息列表
-     * 
+     *
      * @param zsyzTcxx 招商引资_投产信息
      * @return 招商引资_投产信息
      */
     @Override
-    public List<ZsyzTcxx> selectZsyzTcxxList(ZsyzTcxx zsyzTcxx)
-    {
+    public List<ZsyzTcxx> selectZsyzTcxxList(ZsyzTcxx zsyzTcxx) {
         return zsyzTcxxMapper.selectZsyzTcxxList(zsyzTcxx);
     }
 
     /**
      * 新增招商引资_投产信息
-     * 
+     *
      * @param zsyzTcxx 招商引资_投产信息
      * @return 结果
      */
     @Override
     @Transactional
-    public int insertZsyzTcxx(ZsyzTcxx zsyzTcxx)
-    {
+    public int insertZsyzTcxx(ZsyzTcxx zsyzTcxx) {
 
         zsyzTcxx.setCreateTime(DateUtils.getNowDate());
         int count = zsyzTcxxMapper.insertZsyzTcxx(zsyzTcxx);
+
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzTcxx.getXmId());
+        zsyzSbbzb.setProgress(TEN);
+        zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         //保存附件信息
         List<ZsyzFj> zsyzFjList = zsyzTcxx.getZsyzFjList();
         for (ZsyzFj zsyzFj : zsyzFjList) {
@@ -90,19 +99,25 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
 
     /**
      * 修改招商引资_投产信息
-     * 
+     *
      * @param zsyzTcxx 招商引资_投产信息
      * @return 结果
      */
     @Override
     @Transactional
-    public int updateZsyzTcxx(ZsyzTcxx zsyzTcxx)
-    {
+    public int updateZsyzTcxx(ZsyzTcxx zsyzTcxx) {
 
         zsyzTcxx.setUpdateTime(DateUtils.getNowDate());
         int count = zsyzTcxxMapper.updateZsyzTcxx(zsyzTcxx);
+        ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+        zsyzSbbzb.setId(zsyzTcxx.getXmId());
+        ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzTcxx.getXmId());
+        if (zsyzSbbzbOld != null && zsyzSbbzbOld.getProgress().equals(NIN)) {
+            zsyzSbbzb.setProgress(TEN);
+            zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+        }
         //修改附件
-        if(zsyzTcxx.getZsyzFjList()!=null && zsyzTcxx.getZsyzFjList().size()>0){
+        if (zsyzTcxx.getZsyzFjList() != null && zsyzTcxx.getZsyzFjList().size() > 0) {
             //先删除相关附件
             zsyzFjMapper.deleteZsyzFjBySourceId(zsyzTcxx.getId());
             //再将文件新增进数据库
@@ -121,25 +136,23 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService
 
     /**
      * 批量删除招商引资_投产信息
-     * 
+     *
      * @param ids 需要删除的招商引资_投产信息ID
      * @return 结果
      */
     @Override
-    public int deleteZsyzTcxxByIds(Long[] ids)
-    {
+    public int deleteZsyzTcxxByIds(Long[] ids) {
         return zsyzTcxxMapper.deleteZsyzTcxxByIds(ids);
     }
 
     /**
      * 删除招商引资_投产信息信息
-     * 
+     *
      * @param id 招商引资_投产信息ID
      * @return 结果
      */
     @Override
-    public int deleteZsyzTcxxById(Long id)
-    {
+    public int deleteZsyzTcxxById(Long id) {
         return zsyzTcxxMapper.deleteZsyzTcxxById(id);
     }
 }

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

@@ -60,7 +60,6 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     //主要功能, 对线索进度进行控制
     @Override
     public AjaxResult xssh(ZsyzShyj zsyzShyj) {
-        //todo 可能要知道是什么角色来审核
         //获取审核结果
         String shjg = zsyzShyj.getShjg();
         //往审核意见表插入数据
@@ -93,11 +92,12 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             //审核通过需要进入下一阶段/要素部门审核通过,不进行进度前进
             //判断项目进度
             zsyzSbbzb.setProgress(changeProgress(progress));
-
+            zsyzSbbzb.setShjg(ONE);
             zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         } else if (TWO.equals(shjg)) {
             //驳回
             zsyzSbbzb.setProgress(changeProgressBack(progress));
+            zsyzSbbzb.setShjg(TWO);
             zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         }
         return AjaxResult.success();

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

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectZsyzKgxxById" parameterType="Long" resultMap="ZsyzKgxxResult">
         <include refid="selectZsyzKgxxVo"/>
-        where id = #{id}
+        where xm_id = #{id}
     </select>
         
     <insert id="insertZsyzKgxx" parameterType="ZsyzKgxx" useGeneratedKeys="true" keyProperty="id">

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

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
     <update id="updateZsyzProjectDeptByXmId" parameterType="ZsyzProjectDept">
-        update zsyz_project_dept ser is_hf = 'Y' where xm_id = #{xmId} and dept_id = #{deptId}
+        update zsyz_project_dept set is_hf = 'Y' where xm_id = #{xmId} and dept_id = #{deptId}
     </update>
 
     <delete id="deleteZsyzProjectDeptById" parameterType="Long">

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

@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectZsyzQyxxById" parameterType="Long" resultMap="ZsyzQyxxResult">
         <include refid="selectZsyzQyxxVo"/>
-        where id = #{id}
+        where xm_id = #{id}
     </select>
         
     <insert id="insertZsyzQyxx" parameterType="ZsyzQyxx" useGeneratedKeys="true" keyProperty="id">

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

@@ -52,6 +52,7 @@
         <result property="cjdName" column="cjd_name"/>
         <result property="isMeet" column="is_meet"/>
         <result property="meetRemark" column="meet_remark"/>
+        <result property="shjg" column="shjg"/>
 
 
         <association property="zsyzQyxx" javaType="ZsyzQyxx" resultMap="ZsyzQyxxResult"/>
@@ -223,7 +224,8 @@
                cjd_id,
                cjd_name,
                is_meet,
-               meet_remark
+               meet_remark,
+               shjg
         from zsyz_sbbzb
     </sql>
 
@@ -234,10 +236,8 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
-        s.cjd_name, s.is_meet, s.meet_remark,
-        j.id,j.xm_id,j.xmbh,j.xmmc,j.dept_id,j.shrxm,j.xmjd,j.shjg,j.shyj,j.shsj
+        s.cjd_name, s.is_meet, s.meet_remark,s.shjg
         from zsyz_sbbzb s
-        left join zsyz_shyj j on s.id = j.xm_id
         <where>
             s.is_del = 'N'
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
@@ -280,6 +280,7 @@
             <if test="cjdName != null  and cjdName != ''">and s.cjd_name like concat('%', #{cjdName}, '%')</if>
             <if test="isMeet != null  and isMeet != ''">and s.is_meet = #{isMeet}</if>
             <if test="meetRemark != null  and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
+            <if test="shjg != null  and shjg != ''">and s.shjg = #{shjg}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
@@ -298,10 +299,8 @@
         s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
-        s.cjd_name, s.is_meet, s.meet_remark,
-        j.id,j.xm_id,j.xmbh,j.xmmc,j.dept_id,j.shrxm,j.xmjd,j.shjg,j.shyj,j.shsj
+        s.cjd_name, s.is_meet, s.meet_remark,s.shjg
         from zsyz_sbbzb s
-        left join zsyz_shyj j on s.id = j.xm_id
         where s.id = #{id} and s.is_del = 'N'
     </select>
 
@@ -657,6 +656,7 @@
             <if test="cjdName != null">cjd_name,</if>
             <if test="isMeet != null">is_meet,</if>
             <if test="meetRemark != null">meet_remark,</if>
+            <if test="shjg != null">shjg,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbdw != null and sbdw != ''">#{sbdw},</if>
@@ -705,6 +705,7 @@
             <if test="cjdName != null">#{cjdName},</if>
             <if test="isMeet != null">#{isMeet},</if>
             <if test="meetRemark != null">#{meetRemark},</if>
+            <if test="shjg != null">#{shjg},</if>
         </trim>
     </insert>
 
@@ -757,6 +758,7 @@
             <if test="cjdName != null">cjd_name = #{cjdName},</if>
             <if test="isMeet != null">is_meet = #{isMeet},</if>
             <if test="meetRemark != null">meet_remark = #{meetRemark},</if>
+            <if test="shjg != null">shjg = #{shjg},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectZsyzTcxxById" parameterType="Long" resultMap="ZsyzTcxxResult">
         <include refid="selectZsyzTcxxVo"/>
-        where id = #{id}
+        where xm_id = #{id}
     </select>
         
     <insert id="insertZsyzTcxx" parameterType="ZsyzTcxx" useGeneratedKeys="true" keyProperty="id">