修改部门可以不需要上级部门

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

@@ -22,7 +22,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 项目施工进度Controller
+ * 项目施工进度照片
  * 
  * @author boman
  * @date 2023-02-23

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

@@ -94,7 +94,7 @@ public class ZsyzCommonController extends BaseController {
 
     /**
      * 线索指派给承接地的接口
-     * todo 需要短信下发
+     * todo 增加指派给协同单位
      * @return
      */
     @PostMapping("/xszp")

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

@@ -26,6 +26,11 @@ public class XmConstructionRate extends BaseEntity
     @Excel(name = "项目编号")
     private String xmbh;
 
+    /**
+     * 描述
+     */
+    private String jdDescribe;
+
     /** 项目名称 */
     @Excel(name = "项目名称")
     private String xmmc;
@@ -42,7 +47,15 @@ public class XmConstructionRate extends BaseEntity
     @Excel(name = "照片*")
     private String photo;
 
-    public void setId(Long id) 
+    public String getJdDescribe() {
+        return jdDescribe;
+    }
+
+    public void setJdDescribe(String jdDescribe) {
+        this.jdDescribe = jdDescribe;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -120,6 +133,7 @@ public class XmConstructionRate extends BaseEntity
             .append("isDel", getIsDel())
             .append("rateType", getRateType())
             .append("photo", getPhoto())
+            .append("jdDescribe", getJdDescribe())
             .toString();
     }
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain.projectV2;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -85,6 +87,9 @@ public class ZsyzJzqk extends BaseEntity
     @Excel(name = "下一步工作计划")
     private String gzjh;
 
+    /** 附件集合 */
+    private List<ZsyzFj> zsyzFjList;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -239,6 +244,14 @@ public class ZsyzJzqk extends BaseEntity
         return gzjh;
     }
 
+    public List<ZsyzFj> getZsyzFjList() {
+        return zsyzFjList;
+    }
+
+    public void setZsyzFjList(List<ZsyzFj> zsyzFjList) {
+        this.zsyzFjList = zsyzFjList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -61,5 +61,5 @@ public interface ZsyzFjMapper
      */
     public int deleteZsyzFjByIds(Long[] ids);
 
-    void deleteZsyzFjBySourceId(Long id);
+    void deleteZsyzFjBySourceId(ZsyzFj zsyzFj);
 }

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

@@ -5,11 +5,17 @@ import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzFj;
 import com.ruoyi.system.domain.projectV2.ZsyzJzqk;
+import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzJzqkMapper;
 import com.ruoyi.system.service.projectV2.IZsyzJzqkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import static com.ruoyi.common.constant.CommonConstants.FIV;
+import static com.ruoyi.common.constant.CommonConstants.FOR;
+
 /**
  * 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)Service业务层处理
  * 
@@ -22,6 +28,9 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
     @Autowired
     private ZsyzJzqkMapper zsyzJzqkMapper;
 
+    @Autowired
+    private ZsyzFjMapper zsyzFjMapper;
+
     /**
      * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
      * 
@@ -31,7 +40,17 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
     @Override
     public ZsyzJzqk selectZsyzJzqkById(Long id)
     {
-        return zsyzJzqkMapper.selectZsyzJzqkById(id);
+        ZsyzJzqk zsyzJzqk = zsyzJzqkMapper.selectZsyzJzqkById(id);
+        if (zsyzJzqk != null) {
+            ZsyzFj zsyzFj = new ZsyzFj();
+            zsyzFj.setSourceId(id);
+            zsyzFj.setType(FIV);
+            List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+            if (zsyzFjList != null && zsyzFjList.size() > 0) {
+                zsyzJzqk.setZsyzFjList(zsyzFjList);
+            }
+        }
+        return zsyzJzqk;
     }
 
     /**
@@ -59,7 +78,19 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
         zsyzJzqk.setDeptName(user.getDept().getDeptName());
         zsyzJzqk.setDeptId(user.getDeptId());
         zsyzJzqk.setCreateTime(DateUtils.getNowDate());
-        return zsyzJzqkMapper.insertZsyzJzqk(zsyzJzqk);
+        int i = zsyzJzqkMapper.insertZsyzJzqk(zsyzJzqk);
+        //保存附件信息
+        List<ZsyzFj> zsyzFjList = zsyzJzqk.getZsyzFjList();
+        if (zsyzFjList != null){
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzJzqk.getId());
+                zsyzFj.setType(FIV);
+                zsyzFj.setXmId(zsyzJzqk.getXmId());
+                zsyzFj.setXmbh(zsyzJzqk.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
+        }
+        return i;
     }
 
     /**
@@ -72,6 +103,23 @@ public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
     public int updateZsyzJzqk(ZsyzJzqk zsyzJzqk)
     {
         zsyzJzqk.setUpdateTime(DateUtils.getNowDate());
+        //修改附件
+        if (zsyzJzqk.getZsyzFjList() != null && zsyzJzqk.getZsyzFjList().size() > 0) {
+            ZsyzFj zsyzFjDelete = new ZsyzFj();
+            zsyzFjDelete.setSourceId(zsyzJzqk.getId());
+            zsyzFjDelete.setType(FIV);
+            //先删除相关附件
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
+            //再将文件新增进数据库
+            List<ZsyzFj> zsyzFjList = zsyzJzqk.getZsyzFjList();
+            for (ZsyzFj zsyzFj : zsyzFjList) {
+                zsyzFj.setSourceId(zsyzJzqk.getId());
+                zsyzFj.setType(FIV);
+                zsyzFj.setXmId(zsyzJzqk.getXmId());
+                zsyzFj.setXmbh(zsyzJzqk.getXmbh());
+                zsyzFjMapper.insertZsyzFj(zsyzFj);
+            }
+        }
         return zsyzJzqkMapper.updateZsyzJzqk(zsyzJzqk);
     }
 

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

@@ -51,6 +51,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
         if (zsyzKgxx != null){
             ZsyzFj zsyzFj = new ZsyzFj();
             zsyzFj.setSourceId(id);
+            zsyzFj.setType(THR);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0){
                 zsyzKgxx.setZsyzFjList(zsyzFjList);
@@ -78,7 +79,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertZsyzKgxx(ZsyzKgxx zsyzKgxx)
     {
         zsyzKgxx.setCreateTime(DateUtils.getNowDate());
@@ -92,7 +93,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
         if (zsyzFjList != null){
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzKgxx.getId());
-                zsyzFj.setType("3");
+                zsyzFj.setType(THR);
                 zsyzFj.setXmId(zsyzKgxx.getXmId());
                 zsyzFj.setXmbh(zsyzKgxx.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
@@ -119,7 +120,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int updateZsyzKgxx(ZsyzKgxx zsyzKgxx)
     {
 
@@ -134,13 +135,16 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService
         }
         //修改附件
         if(zsyzKgxx.getZsyzFjList()!=null && zsyzKgxx.getZsyzFjList().size()>0){
+            ZsyzFj zsyzFjDelete = new ZsyzFj();
+            zsyzFjDelete.setSourceId(zsyzKgxx.getId());
+            zsyzFjDelete.setType(THR);
             //先删除相关附件
-            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzKgxx.getId());
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
             //再将文件新增进数据库
             List<ZsyzFj> zsyzFjList = zsyzKgxx.getZsyzFjList();
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzKgxx.getId());
-                zsyzFj.setType("3");
+                zsyzFj.setType(THR);
                 zsyzFj.setXmId(zsyzKgxx.getXmId());
                 zsyzFj.setXmbh(zsyzKgxx.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);

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

@@ -19,8 +19,7 @@ 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;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * 招商引资_签约信息Service业务层处理
@@ -53,6 +52,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         if (zsyzQyxx != null) {
             ZsyzFj zsyzFj = new ZsyzFj();
             zsyzFj.setSourceId(id);
+            zsyzFj.setType(TWO);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {
                 zsyzQyxx.setZsyzFjList(zsyzFjList);
@@ -92,7 +92,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         if (zsyzFjList != null){
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzQyxx.getId());
-                zsyzFj.setType("2");
+                zsyzFj.setType(TWO);
                 zsyzFj.setXmId(zsyzQyxx.getXmId());
                 zsyzFj.setXmbh(zsyzQyxx.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
@@ -134,13 +134,16 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
         }
         //修改附件
         if (zsyzQyxx.getZsyzFjList() != null && zsyzQyxx.getZsyzFjList().size() > 0) {
+            ZsyzFj zsyzFjDelete = new ZsyzFj();
+            zsyzFjDelete.setSourceId(zsyzQyxx.getId());
+            zsyzFjDelete.setType(TWO);
             //先删除相关附件
-            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzQyxx.getId());
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
             //再将文件新增进数据库
             List<ZsyzFj> zsyzFjList = zsyzQyxx.getZsyzFjList();
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzQyxx.getId());
-                zsyzFj.setType("2");
+                zsyzFj.setType(TWO);
                 zsyzFj.setXmId(zsyzQyxx.getXmId());
                 zsyzFj.setXmbh(zsyzQyxx.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);

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

@@ -67,6 +67,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         if (zsyzSbbzb != null){
             ZsyzFj zsyzFj = new ZsyzFj();
             zsyzFj.setSourceId(id);
+            zsyzFj.setType(ONE);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {
                 zsyzSbbzb.setZsyzFjList(zsyzFjList);
@@ -126,7 +127,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
         if (zsyzFjList != null){
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzSbbzb.getId());
-                zsyzFj.setType("1");
+                zsyzFj.setType(ONE);
                 zsyzFj.setXmId(zsyzSbbzb.getId());
                 zsyzFj.setXmbh(zsyzSbbzb.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
@@ -156,20 +157,23 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
 
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         int count = zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
         //修改附件
         if (zsyzSbbzb.getZsyzFjList() != null && zsyzSbbzb.getZsyzFjList().size() > 0) {
+            ZsyzFj zsyzFjDelete = new ZsyzFj();
+            zsyzFjDelete.setSourceId(zsyzSbbzb.getId());
+            zsyzFjDelete.setType(ONE);
             //先删除相关附件
-            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzSbbzb.getId());
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
             //再将文件新增进数据库
             List<ZsyzFj> zsyzFjList = zsyzSbbzb.getZsyzFjList();
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzSbbzb.getId());
-                zsyzFj.setType("1");
+                zsyzFj.setType(ONE);
                 zsyzFj.setXmId(zsyzSbbzb.getId());
                 zsyzFj.setXmbh(zsyzSbbzb.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);

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

@@ -50,6 +50,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         if (zsyzTcxx != null) {
             ZsyzFj zsyzFj = new ZsyzFj();
             zsyzFj.setSourceId(id);
+            zsyzFj.setType(FOR);
             List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
             if (zsyzFjList != null && zsyzFjList.size() > 0) {
                 zsyzTcxx.setZsyzFjList(zsyzFjList);
@@ -91,7 +92,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         if (zsyzFjList != null){
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzTcxx.getId());
-                zsyzFj.setType("4");
+                zsyzFj.setType(FOR);
                 zsyzFj.setXmId(zsyzTcxx.getXmId());
                 zsyzFj.setXmbh(zsyzTcxx.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);
@@ -119,7 +120,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int updateZsyzTcxx(ZsyzTcxx zsyzTcxx) {
 
         zsyzTcxx.setUpdateTime(DateUtils.getNowDate());
@@ -133,13 +134,16 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         }
         //修改附件
         if (zsyzTcxx.getZsyzFjList() != null && zsyzTcxx.getZsyzFjList().size() > 0) {
+            ZsyzFj zsyzFjDelete = new ZsyzFj();
+            zsyzFjDelete.setSourceId(zsyzTcxx.getId());
+            zsyzFjDelete.setType(FOR);
             //先删除相关附件
-            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzTcxx.getId());
+            zsyzFjMapper.deleteZsyzFjBySourceId(zsyzFjDelete);
             //再将文件新增进数据库
             List<ZsyzFj> zsyzFjList = zsyzTcxx.getZsyzFjList();
             for (ZsyzFj zsyzFj : zsyzFjList) {
                 zsyzFj.setSourceId(zsyzTcxx.getId());
-                zsyzFj.setType("4");
+                zsyzFj.setType(FOR);
                 zsyzFj.setXmId(zsyzTcxx.getXmId());
                 zsyzFj.setXmbh(zsyzTcxx.getXmbh());
                 zsyzFjMapper.insertZsyzFj(zsyzFj);

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

@@ -66,9 +66,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
         String roleName = "";
         if (roles != null && roles.size() > 0) {
-            for (SysRole role : roles) {
-                roleName = role.getRoleKey();
-            }
+            roleName = roles.get(0).getRoleKey();
         }
         //获取审核结果
         String shjg = zsyzShyj.getShjg();
@@ -77,40 +75,29 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //根据角色和项目进度来判断能不能审核,判断是否通过
         ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
         zsyzSbbzb.setId(zsyzShyj.getXmId());
-        //如果是要素部门处理,需要修改中间表的回复字段
-        if (YSBM.equals(roleName)) {
-            ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
-            zsyzProjectDept.setXmId(zsyzShyj.getXmId());
-            zsyzProjectDept.setDeptId(SecurityUtils.getDeptId());
-            //查询是否回复过最新的一条
-            ZsyzProjectDept zsyzProjectDeptOld = projectDeptService.selectZsyzProjectDeptByXmId(zsyzProjectDept);
-            if (zsyzProjectDeptOld != null && "Y".equals(zsyzProjectDeptOld.getIsHf())) {
-                return AjaxResult.error("当前已审核");
+
+        if (ONE.equals(shjg)) {
+            //通过
+            //审核通过需要进入下一阶段/要素部门审核通过,不进行进度前进
+            //判断项目进度
+            String progressResult = changeProgress(progress, roleName);
+            if (ERROR.equals(progressResult)) {
+                return AjaxResult.error("当前状态下您没有审核权限");
             }
-            projectDeptService.updateZsyzProjectDeptByXmId(zsyzProjectDept);
-        } else {
-            if (ONE.equals(shjg)) {
-                //通过
-                //审核通过需要进入下一阶段/要素部门审核通过,不进行进度前进
-                //判断项目进度
-                String progressResult = changeProgress(progress, roleName);
-                if (ERROR.equals(progressResult)) {
-                    return AjaxResult.error("当前状态下您没有审核权限");
-                }
-                zsyzSbbzb.setProgress(progressResult);
-                zsyzSbbzb.setShjg(ONE);
-                zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
-            } else if (TWO.equals(shjg)) {
-                String progressResult = changeProgressBack(progress, roleName);
-                if (ERROR.equals(progressResult)) {
-                    return AjaxResult.error("当前状态下您没有审核权限");
-                }
-                //驳回
-                zsyzSbbzb.setProgress(progressResult);
-                zsyzSbbzb.setShjg(TWO);
-                zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+            zsyzSbbzb.setProgress(progressResult);
+            zsyzSbbzb.setShjg(ONE);
+            zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
+        } else if (TWO.equals(shjg)) {
+            String progressResult = changeProgressBack(progress, roleName);
+            if (ERROR.equals(progressResult)) {
+                return AjaxResult.error("当前状态下您没有审核权限");
             }
+            //驳回
+            zsyzSbbzb.setProgress(progressResult);
+            zsyzSbbzb.setShjg(TWO);
+            zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
         }
+
         //往审核意见表插入数据
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysDept dept = loginUser.getUser().getDept();

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="xmId"    column="xm_id"    />
         <result property="xmbh"    column="xmbh"    />
         <result property="xmmc"    column="xmmc"    />
+        <result property="jdDescribe"    column="jd_describe"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectXmConstructionRateVo">
-        select id, xm_id, xmbh, xmmc, create_by, create_time, update_by, update_time, is_del, rate_type, photo from xm_construction_rate
+        select id, xm_id, xmbh, xmmc,jd_describe, create_by, create_time, update_by, update_time, is_del, rate_type, photo from xm_construction_rate
     </sql>
 
     <select id="selectXmConstructionRateList" parameterType="XmConstructionRate" resultMap="XmConstructionRateResult">
@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
             <if test="xmmc != null">xmmc,</if>
+            <if test="jdDescribe != null">jd_describe,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
             <if test="xmmc != null">#{xmmc},</if>
+            <if test="jdDescribe != null">#{jdDescribe},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -74,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
             <if test="xmmc != null">xmmc = #{xmmc},</if>
+            <if test="jdDescribe != null">jd_describe = #{jdDescribe},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

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

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-    <delete id="deleteZsyzFjBySourceId">
-        delete from zsyz_fj where source_id = #{id}
+    <delete id="deleteZsyzFjBySourceId" parameterType="ZsyzFj">
+        delete from zsyz_fj where source_id = #{sourceId} and type = #{type}
     </delete>
 </mapper>