新增 V2版本项目申报

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.XmConstructionRate;
+import com.ruoyi.system.service.projectV2.IXmConstructionRateService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目施工进度Controller
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+@RestController
+@RequestMapping("/projectV2/rate")
+public class XmConstructionRateController extends BaseController
+{
+    @Autowired
+    private IXmConstructionRateService xmConstructionRateService;
+
+    /**
+     * 查询项目施工进度列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:rate:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(XmConstructionRate xmConstructionRate)
+    {
+        startPage();
+        List<XmConstructionRate> list = xmConstructionRateService.selectXmConstructionRateList(xmConstructionRate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目施工进度列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:rate:export')")
+    @Log(title = "项目施工进度", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(XmConstructionRate xmConstructionRate)
+    {
+        List<XmConstructionRate> list = xmConstructionRateService.selectXmConstructionRateList(xmConstructionRate);
+        ExcelUtil<XmConstructionRate> util = new ExcelUtil<XmConstructionRate>(XmConstructionRate.class);
+        return util.exportExcel(list, "rate");
+    }
+
+    /**
+     * 获取项目施工进度详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:rate:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(xmConstructionRateService.selectXmConstructionRateById(id));
+    }
+
+    /**
+     * 新增项目施工进度
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:rate:add')")
+    @Log(title = "项目施工进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody XmConstructionRate xmConstructionRate)
+    {
+        return toAjax(xmConstructionRateService.insertXmConstructionRate(xmConstructionRate));
+    }
+
+    /**
+     * 修改项目施工进度
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:rate:edit')")
+    @Log(title = "项目施工进度", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody XmConstructionRate xmConstructionRate)
+    {
+        return toAjax(xmConstructionRateService.updateXmConstructionRate(xmConstructionRate));
+    }
+
+    /**
+     * 删除项目施工进度
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:rate:remove')")
+    @Log(title = "项目施工进度", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(xmConstructionRateService.deleteXmConstructionRateByIds(ids));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
+import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_项目和部门关联Controller
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+@RestController
+@RequestMapping("/projectV2/dept")
+public class ZsyzProjectDeptController extends BaseController
+{
+    @Autowired
+    private IZsyzProjectDeptService zsyzProjectDeptService;
+
+    /**
+     * 查询招商引资_项目和部门关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dept:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzProjectDept zsyzProjectDept)
+    {
+        startPage();
+        List<ZsyzProjectDept> list = zsyzProjectDeptService.selectZsyzProjectDeptList(zsyzProjectDept);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_项目和部门关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dept:export')")
+    @Log(title = "招商引资_项目和部门关联", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(ZsyzProjectDept zsyzProjectDept)
+    {
+        List<ZsyzProjectDept> list = zsyzProjectDeptService.selectZsyzProjectDeptList(zsyzProjectDept);
+        ExcelUtil<ZsyzProjectDept> util = new ExcelUtil<ZsyzProjectDept>(ZsyzProjectDept.class);
+        return util.exportExcel(list, "dept");
+    }
+
+    /**
+     * 获取招商引资_项目和部门关联详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dept:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(zsyzProjectDeptService.selectZsyzProjectDeptById(id));
+    }
+
+    /**
+     * 新增招商引资_项目和部门关联
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dept:add')")
+    @Log(title = "招商引资_项目和部门关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzProjectDept zsyzProjectDept)
+    {
+        return toAjax(zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept));
+    }
+
+    /**
+     * 修改招商引资_项目和部门关联
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dept:edit')")
+    @Log(title = "招商引资_项目和部门关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzProjectDept zsyzProjectDept)
+    {
+        return toAjax(zsyzProjectDeptService.updateZsyzProjectDept(zsyzProjectDept));
+    }
+
+    /**
+     * 删除招商引资_项目和部门关联
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dept:remove')")
+    @Log(title = "招商引资_项目和部门关联", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzProjectDeptService.deleteZsyzProjectDeptByIds(ids));
+    }
+}

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.projectV2.common;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
@@ -10,17 +11,21 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
+import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
+import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.service.projectV2.IZsyzFjService;
+import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
+import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static com.ruoyi.common.constant.CommonConstants.XMBH;
-import static com.ruoyi.common.constant.CommonConstants.ZS;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * 招商引资_附件Controller
@@ -34,6 +39,11 @@ public class ZsyzFjController extends BaseController {
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private IZsyzSbbzbService zsyzSbbzbService;
+
+    @Autowired
+    private IZsyzProjectDeptService zsyzProjectDeptService;
     /**
      * 生成项目编号接口
      * @return
@@ -54,4 +64,50 @@ public class ZsyzFjController extends BaseController {
         redisCache.setCacheObject(xmbhDate, number);
         return AjaxResult.success(stringBuffer);
     }
+
+
+    /**
+     * 线索指派给承接地的接口
+     * @return
+     */
+    @PostMapping("/xszp")
+    public AjaxResult xszp(ZsyzSbbzb zsyzSbbzb) {
+        String zpType = zsyzSbbzb.getZpType();
+        if (ONE.equals(zpType)){
+            ArrayList<SysDept> deptList = zsyzSbbzb.getDeptList();
+            if (deptList != null && deptList.size() > 0){
+                for (SysDept sysDept : deptList) {
+                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
+                    zsyzProjectDept.setXmId(zsyzSbbzb.getId());
+                    zsyzProjectDept.setXmbh(zsyzSbbzb.getXmbh());
+                    zsyzProjectDept.setXmmc(zsyzSbbzb.getXmxsmc());
+                    zsyzProjectDept.setDeptId(sysDept.getDeptId());
+                    zsyzProjectDept.setDeptName(sysDept.getDeptName());
+                    //指派给要素部门
+                    zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
+                }
+            }
+        }else {
+            //判断该项目是否已经被指派
+            ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbService.selectZsyzSbbzbById(zsyzSbbzb.getId());
+            if (zsyzSbbzbOld != null){
+                Long cjdId = zsyzSbbzbOld.getCjdId();
+                if (cjdId != null){
+                    return AjaxResult.error("该线索已被指派,请勿重复指派或等待当前指派承接地放弃承接");
+                }
+            }
+            //指派给承接地
+            zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 线索暂存/终止接口
+     * @return
+     */
+    @PostMapping("/xszc")
+    public AjaxResult xszc(ZsyzSbbzb zsyzSbbzb) {
+        return  toAjax(zsyzSbbzbService.updateZsyzSbbzbForZc(zsyzSbbzb));
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/constant/CommonConstants.java

@@ -12,4 +12,6 @@ public class CommonConstants {
     public static final String XMBH = "xmbh:";
     //项目编号头
     public static final String ZS = "ZS";
+    public static final String ONE = "1";
+    public static final String TWO = "2";
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -1,12 +1,14 @@
 package com.ruoyi.common.core.domain;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.domain.entity.SysDept;
 
 /**
  * Entity基类
@@ -41,6 +43,16 @@ public class BaseEntity implements Serializable
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
+    //部门集合
+    private ArrayList<SysDept> deptList;
+
+    public ArrayList<SysDept> getDeptList() {
+        return deptList;
+    }
+
+    public void setDeptList(ArrayList<SysDept> deptList) {
+        this.deptList = deptList;
+    }
 
     public String getSearchValue()
     {

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

@@ -0,0 +1,125 @@
+package com.ruoyi.system.domain.projectV2;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目施工进度对象 xm_construction_rate
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+public class XmConstructionRate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id* */
+    private Long id;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long xmId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String xmbh;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+    /** 是否删除(0未删除、1已删除)* */
+    @Excel(name = "是否删除(0未删除、1已删除)*")
+    private Long isDel;
+
+    /** 进度(数据字典：奠基、基础工程出土面、主体工程完工、土建竣工)* */
+    @Excel(name = "进度(数据字典：奠基、基础工程出土面、主体工程完工、土建竣工)*")
+    private String rateType;
+
+    /** 照片* */
+    @Excel(name = "照片*")
+    private String photo;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setXmbh(String xmbh) 
+    {
+        this.xmbh = xmbh;
+    }
+
+    public String getXmbh() 
+    {
+        return xmbh;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRateType(String rateType) 
+    {
+        this.rateType = rateType;
+    }
+
+    public String getRateType() 
+    {
+        return rateType;
+    }
+    public void setPhoto(String photo) 
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto() 
+    {
+        return photo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("xmmc", getXmmc())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("rateType", getRateType())
+            .append("photo", getPhoto())
+            .toString();
+    }
+}

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

@@ -0,0 +1,126 @@
+package com.ruoyi.system.domain.projectV2;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 招商引资_项目和部门关联对象 zsyz_project_dept
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+public class ZsyzProjectDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String xmbh;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    /** 祖级列表 */
+    @Excel(name = "祖级列表")
+    private String ancestors;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setXmbh(String xmbh) 
+    {
+        this.xmbh = xmbh;
+    }
+
+    public String getXmbh() 
+    {
+        return xmbh;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName) 
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName() 
+    {
+        return deptName;
+    }
+    public void setAncestors(String ancestors) 
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() 
+    {
+        return ancestors;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("xmmc", getXmmc())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("ancestors", getAncestors())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -187,7 +187,20 @@ public class ZsyzSbbzb extends BaseEntity
     @Excel(name = "会议申请备注")
     private String meetRemark;
 
-    public void setId(Long id) 
+    /**
+     * 前端使用 指派的类型 1:指派给要素部门 2:指派给承接地
+     */
+    private String zpType;
+
+    public String getZpType() {
+        return zpType;
+    }
+
+    public void setZpType(String zpType) {
+        this.zpType = zpType;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.XmConstructionRate;
+
+import java.util.List;
+
+/**
+ * 项目施工进度Mapper接口
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+public interface XmConstructionRateMapper 
+{
+    /**
+     * 查询项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 项目施工进度
+     */
+    public XmConstructionRate selectXmConstructionRateById(Long id);
+
+    /**
+     * 查询项目施工进度列表
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 项目施工进度集合
+     */
+    public List<XmConstructionRate> selectXmConstructionRateList(XmConstructionRate xmConstructionRate);
+
+    /**
+     * 新增项目施工进度
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int insertXmConstructionRate(XmConstructionRate xmConstructionRate);
+
+    /**
+     * 修改项目施工进度
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int updateXmConstructionRate(XmConstructionRate xmConstructionRate);
+
+    /**
+     * 删除项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 结果
+     */
+    public int deleteXmConstructionRateById(Long id);
+
+    /**
+     * 批量删除项目施工进度
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteXmConstructionRateByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
+
+import java.util.List;
+
+/**
+ * 招商引资_项目和部门关联Mapper接口
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+public interface ZsyzProjectDeptMapper 
+{
+    /**
+     * 查询招商引资_项目和部门关联
+     * 
+     * @param id 招商引资_项目和部门关联ID
+     * @return 招商引资_项目和部门关联
+     */
+    public ZsyzProjectDept selectZsyzProjectDeptById(Long id);
+
+    /**
+     * 查询招商引资_项目和部门关联列表
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 招商引资_项目和部门关联集合
+     */
+    public List<ZsyzProjectDept> selectZsyzProjectDeptList(ZsyzProjectDept zsyzProjectDept);
+
+    /**
+     * 新增招商引资_项目和部门关联
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    public int insertZsyzProjectDept(ZsyzProjectDept zsyzProjectDept);
+
+    /**
+     * 修改招商引资_项目和部门关联
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    public int updateZsyzProjectDept(ZsyzProjectDept zsyzProjectDept);
+
+    /**
+     * 删除招商引资_项目和部门关联
+     * 
+     * @param id 招商引资_项目和部门关联ID
+     * @return 结果
+     */
+    public int deleteZsyzProjectDeptById(Long id);
+
+    /**
+     * 批量删除招商引资_项目和部门关联
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteZsyzProjectDeptByIds(Long[] ids);
+}

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

@@ -43,6 +43,9 @@ public interface ZsyzSbbzbMapper
      * @return 结果
      */
     public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb);
+    public int updateZsyzSbbzbCjd(ZsyzSbbzb zsyzSbbzb);
+    //线索暂存/终止接口
+    public int updateZsyzSbbzbForZc(ZsyzSbbzb zsyzSbbzb);
 
     /**
      * 删除招商引资_申报_首谈信息_主

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.XmConstructionRate;
+import com.ruoyi.system.mapper.projectV2.XmConstructionRateMapper;
+import com.ruoyi.system.service.projectV2.IXmConstructionRateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目施工进度Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+@Service
+public class XmConstructionRateServiceImpl implements IXmConstructionRateService
+{
+    @Autowired
+    private XmConstructionRateMapper xmConstructionRateMapper;
+
+    /**
+     * 查询项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 项目施工进度
+     */
+    @Override
+    public XmConstructionRate selectXmConstructionRateById(Long id)
+    {
+        return xmConstructionRateMapper.selectXmConstructionRateById(id);
+    }
+
+    /**
+     * 查询项目施工进度列表
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 项目施工进度
+     */
+    @Override
+    public List<XmConstructionRate> selectXmConstructionRateList(XmConstructionRate xmConstructionRate)
+    {
+        return xmConstructionRateMapper.selectXmConstructionRateList(xmConstructionRate);
+    }
+
+    /**
+     * 新增项目施工进度
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    @Override
+    public int insertXmConstructionRate(XmConstructionRate xmConstructionRate)
+    {
+        xmConstructionRate.setCreateTime(DateUtils.getNowDate());
+        return xmConstructionRateMapper.insertXmConstructionRate(xmConstructionRate);
+    }
+
+    /**
+     * 修改项目施工进度
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    @Override
+    public int updateXmConstructionRate(XmConstructionRate xmConstructionRate)
+    {
+        xmConstructionRate.setUpdateTime(DateUtils.getNowDate());
+        return xmConstructionRateMapper.updateXmConstructionRate(xmConstructionRate);
+    }
+
+    /**
+     * 批量删除项目施工进度
+     * 
+     * @param ids 需要删除的项目施工进度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteXmConstructionRateByIds(Long[] ids)
+    {
+        return xmConstructionRateMapper.deleteXmConstructionRateByIds(ids);
+    }
+
+    /**
+     * 删除项目施工进度信息
+     * 
+     * @param id 项目施工进度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteXmConstructionRateById(Long id)
+    {
+        return xmConstructionRateMapper.deleteXmConstructionRateById(id);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
+import com.ruoyi.system.mapper.projectV2.ZsyzProjectDeptMapper;
+import com.ruoyi.system.service.projectV2.IZsyzProjectDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 招商引资_项目和部门关联Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+@Service
+public class ZsyzProjectDeptServiceImpl implements IZsyzProjectDeptService
+{
+    @Autowired
+    private ZsyzProjectDeptMapper zsyzProjectDeptMapper;
+
+    /**
+     * 查询招商引资_项目和部门关联
+     * 
+     * @param id 招商引资_项目和部门关联ID
+     * @return 招商引资_项目和部门关联
+     */
+    @Override
+    public ZsyzProjectDept selectZsyzProjectDeptById(Long id)
+    {
+        return zsyzProjectDeptMapper.selectZsyzProjectDeptById(id);
+    }
+
+    /**
+     * 查询招商引资_项目和部门关联列表
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 招商引资_项目和部门关联
+     */
+    @Override
+    public List<ZsyzProjectDept> selectZsyzProjectDeptList(ZsyzProjectDept zsyzProjectDept)
+    {
+        return zsyzProjectDeptMapper.selectZsyzProjectDeptList(zsyzProjectDept);
+    }
+
+    /**
+     * 新增招商引资_项目和部门关联
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzProjectDept(ZsyzProjectDept zsyzProjectDept)
+    {
+        zsyzProjectDept.setCreateTime(DateUtils.getNowDate());
+        return zsyzProjectDeptMapper.insertZsyzProjectDept(zsyzProjectDept);
+    }
+
+    /**
+     * 修改招商引资_项目和部门关联
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzProjectDept(ZsyzProjectDept zsyzProjectDept)
+    {
+        zsyzProjectDept.setUpdateTime(DateUtils.getNowDate());
+        return zsyzProjectDeptMapper.updateZsyzProjectDept(zsyzProjectDept);
+    }
+
+    /**
+     * 批量删除招商引资_项目和部门关联
+     * 
+     * @param ids 需要删除的招商引资_项目和部门关联ID
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzProjectDeptByIds(Long[] ids)
+    {
+        return zsyzProjectDeptMapper.deleteZsyzProjectDeptByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_项目和部门关联信息
+     * 
+     * @param id 招商引资_项目和部门关联ID
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzProjectDeptById(Long id)
+    {
+        return zsyzProjectDeptMapper.deleteZsyzProjectDeptById(id);
+    }
+}

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

@@ -11,87 +11,98 @@ import java.util.List;
 
 /**
  * 招商引资_申报_首谈信息_主Service业务层处理
- * 
+ *
  * @author boman
  * @date 2023-02-23
  */
 @Service
-public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService
-{
+public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     @Autowired
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
 
     /**
      * 查询招商引资_申报_首谈信息_主
-     * 
+     *
      * @param id 招商引资_申报_首谈信息_主ID
      * @return 招商引资_申报_首谈信息_主
      */
     @Override
-    public ZsyzSbbzb selectZsyzSbbzbById(Long id)
-    {
+    public ZsyzSbbzb selectZsyzSbbzbById(Long id) {
         return zsyzSbbzbMapper.selectZsyzSbbzbById(id);
     }
 
     /**
      * 查询招商引资_申报_首谈信息_主列表
-     * 
+     *
      * @param zsyzSbbzb 招商引资_申报_首谈信息_主
      * @return 招商引资_申报_首谈信息_主
      */
     @Override
-    public List<ZsyzSbbzb> selectZsyzSbbzbList(ZsyzSbbzb zsyzSbbzb)
-    {
+    public List<ZsyzSbbzb> selectZsyzSbbzbList(ZsyzSbbzb zsyzSbbzb) {
         return zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
     }
 
     /**
      * 新增招商引资_申报_首谈信息_主
-     * 
+     *
      * @param zsyzSbbzb 招商引资_申报_首谈信息_主
      * @return 结果
      */
     @Override
-    public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
-    {
+    public int insertZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
         zsyzSbbzb.setCreateTime(DateUtils.getNowDate());
         return zsyzSbbzbMapper.insertZsyzSbbzb(zsyzSbbzb);
     }
 
     /**
      * 修改招商引资_申报_首谈信息_主
-     * 
+     *
      * @param zsyzSbbzb 招商引资_申报_首谈信息_主
      * @return 结果
      */
     @Override
-    public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb)
-    {
+    public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb) {
         zsyzSbbzb.setUpdateTime(DateUtils.getNowDate());
         return zsyzSbbzbMapper.updateZsyzSbbzb(zsyzSbbzb);
     }
 
+    /**
+     * 更新承接地信息
+     *
+     * @param zsyzSbbzb
+     * @return
+     */
+    @Override
+    public int updateZsyzSbbzbCjd(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzSbbzbMapper.updateZsyzSbbzbCjd(zsyzSbbzb);
+    }
+
+    //线索暂存/终止接口
+    @Override
+    public int updateZsyzSbbzbForZc(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzSbbzbMapper.updateZsyzSbbzbForZc(zsyzSbbzb);
+    }
+
+
     /**
      * 批量删除招商引资_申报_首谈信息_主
-     * 
+     *
      * @param ids 需要删除的招商引资_申报_首谈信息_主ID
      * @return 结果
      */
     @Override
-    public int deleteZsyzSbbzbByIds(Long[] ids)
-    {
+    public int deleteZsyzSbbzbByIds(Long[] ids) {
         return zsyzSbbzbMapper.deleteZsyzSbbzbByIds(ids);
     }
 
     /**
      * 删除招商引资_申报_首谈信息_主信息
-     * 
+     *
      * @param id 招商引资_申报_首谈信息_主ID
      * @return 结果
      */
     @Override
-    public int deleteZsyzSbbzbById(Long id)
-    {
+    public int deleteZsyzSbbzbById(Long id) {
         return zsyzSbbzbMapper.deleteZsyzSbbzbById(id);
     }
 }

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.XmConstructionRate;
+
+import java.util.List;
+
+
+/**
+ * 项目施工进度Service接口
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+public interface IXmConstructionRateService 
+{
+    /**
+     * 查询项目施工进度
+     * 
+     * @param id 项目施工进度ID
+     * @return 项目施工进度
+     */
+    public XmConstructionRate selectXmConstructionRateById(Long id);
+
+    /**
+     * 查询项目施工进度列表
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 项目施工进度集合
+     */
+    public List<XmConstructionRate> selectXmConstructionRateList(XmConstructionRate xmConstructionRate);
+
+    /**
+     * 新增项目施工进度
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int insertXmConstructionRate(XmConstructionRate xmConstructionRate);
+
+    /**
+     * 修改项目施工进度
+     * 
+     * @param xmConstructionRate 项目施工进度
+     * @return 结果
+     */
+    public int updateXmConstructionRate(XmConstructionRate xmConstructionRate);
+
+    /**
+     * 批量删除项目施工进度
+     * 
+     * @param ids 需要删除的项目施工进度ID
+     * @return 结果
+     */
+    public int deleteXmConstructionRateByIds(Long[] ids);
+
+    /**
+     * 删除项目施工进度信息
+     * 
+     * @param id 项目施工进度ID
+     * @return 结果
+     */
+    public int deleteXmConstructionRateById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzProjectDept;
+
+import java.util.List;
+
+/**
+ * 招商引资_项目和部门关联Service接口
+ * 
+ * @author boman
+ * @date 2023-02-23
+ */
+public interface IZsyzProjectDeptService 
+{
+    /**
+     * 查询招商引资_项目和部门关联
+     * 
+     * @param id 招商引资_项目和部门关联ID
+     * @return 招商引资_项目和部门关联
+     */
+    public ZsyzProjectDept selectZsyzProjectDeptById(Long id);
+
+    /**
+     * 查询招商引资_项目和部门关联列表
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 招商引资_项目和部门关联集合
+     */
+    public List<ZsyzProjectDept> selectZsyzProjectDeptList(ZsyzProjectDept zsyzProjectDept);
+
+    /**
+     * 新增招商引资_项目和部门关联
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    public int insertZsyzProjectDept(ZsyzProjectDept zsyzProjectDept);
+
+    /**
+     * 修改招商引资_项目和部门关联
+     * 
+     * @param zsyzProjectDept 招商引资_项目和部门关联
+     * @return 结果
+     */
+    public int updateZsyzProjectDept(ZsyzProjectDept zsyzProjectDept);
+
+    /**
+     * 批量删除招商引资_项目和部门关联
+     * 
+     * @param ids 需要删除的招商引资_项目和部门关联ID
+     * @return 结果
+     */
+    public int deleteZsyzProjectDeptByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_项目和部门关联信息
+     * 
+     * @param id 招商引资_项目和部门关联ID
+     * @return 结果
+     */
+    public int deleteZsyzProjectDeptById(Long id);
+}

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

@@ -44,6 +44,12 @@ public interface IZsyzSbbzbService
      */
     public int updateZsyzSbbzb(ZsyzSbbzb zsyzSbbzb);
 
+    //更新承接地信息
+    public int updateZsyzSbbzbCjd(ZsyzSbbzb zsyzSbbzb);
+
+    //线索暂存/终止
+    public int updateZsyzSbbzbForZc(ZsyzSbbzb zsyzSbbzb);
+
     /**
      * 批量删除招商引资_申报_首谈信息_主
      * 

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

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.projectV2.XmConstructionRateMapper">
+    
+    <resultMap type="XmConstructionRate" id="XmConstructionRateResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="rateType"    column="rate_type"    />
+        <result property="photo"    column="photo"    />
+    </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
+    </sql>
+
+    <select id="selectXmConstructionRateList" parameterType="XmConstructionRate" resultMap="XmConstructionRateResult">
+        <include refid="selectXmConstructionRateVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="rateType != null  and rateType != ''"> and rate_type = #{rateType}</if>
+            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+        </where>
+    </select>
+    
+    <select id="selectXmConstructionRateById" parameterType="Long" resultMap="XmConstructionRateResult">
+        <include refid="selectXmConstructionRateVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertXmConstructionRate" parameterType="XmConstructionRate" useGeneratedKeys="true" keyProperty="id">
+        insert into xm_construction_rate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="xmmc != null">xmmc,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="rateType != null">rate_type,</if>
+            <if test="photo != null">photo,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmmc != null">#{xmmc},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="rateType != null">#{rateType},</if>
+            <if test="photo != null">#{photo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateXmConstructionRate" parameterType="XmConstructionRate">
+        update xm_construction_rate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmmc != null">xmmc = #{xmmc},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="rateType != null">rate_type = #{rateType},</if>
+            <if test="photo != null">photo = #{photo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteXmConstructionRateById" parameterType="Long">
+        delete from xm_construction_rate where id = #{id}
+    </delete>
+
+    <delete id="deleteXmConstructionRateByIds" parameterType="String">
+        delete from xm_construction_rate where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.projectV2.ZsyzProjectDeptMapper">
+    
+    <resultMap type="ZsyzProjectDept" id="ZsyzProjectDeptResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="ancestors"    column="ancestors"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectZsyzProjectDeptVo">
+        select id, xm_id, xmbh, xmmc, dept_id, dept_name, ancestors, create_by, create_time, update_by, update_time, remark from zsyz_project_dept
+    </sql>
+
+    <select id="selectZsyzProjectDeptList" parameterType="ZsyzProjectDept" resultMap="ZsyzProjectDeptResult">
+        <include refid="selectZsyzProjectDeptVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzProjectDeptById" parameterType="Long" resultMap="ZsyzProjectDeptResult">
+        <include refid="selectZsyzProjectDeptVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzProjectDept" parameterType="ZsyzProjectDept" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_project_dept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="xmmc != null">xmmc,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="ancestors != null">ancestors,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmmc != null">#{xmmc},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="ancestors != null">#{ancestors},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZsyzProjectDept" parameterType="ZsyzProjectDept">
+        update zsyz_project_dept
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmmc != null">xmmc = #{xmmc},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="ancestors != null">ancestors = #{ancestors},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteZsyzProjectDeptById" parameterType="Long">
+        delete from zsyz_project_dept where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzProjectDeptByIds" parameterType="String">
+        delete from zsyz_project_dept where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper">
-    
+
     <resultMap type="ZsyzSbbzb" id="ZsyzSbbzbResult">
-        <result property="id"    column="id"    />
-        <result property="sbdw"    column="sbdw"    />
-        <result property="tbrq"    column="tbrq"    />
-        <result property="zszxfzr"    column="zszxfzr"    />
-        <result property="xmbh"    column="xmbh"    />
-        <result property="xmxsmc"    column="xmxsmc"    />
-        <result property="sfwlhxxxm"    column="sfwlhxxxm"    />
-        <result property="yzdqId"    column="yzdq_id"    />
-        <result property="yzdqName"    column="yzdq_name"    />
-        <result property="yzssName"    column="yzss_name"    />
-        <result property="ntze"    column="ntze"    />
-        <result property="cylxId"    column="cylx_id"    />
-        <result property="cylxName"    column="cylx_name"    />
-        <result property="xmlb"    column="xmlb"    />
-        <result property="tzlb"    column="tzlb"    />
-        <result property="nlhd"    column="nlhd"    />
-        <result property="czpt"    column="czpt"    />
-        <result property="tzzt"    column="tzzt"    />
-        <result property="xmjz"    column="xmjz"    />
-        <result property="gtzzrsfzhm"    column="gtzzrsfzhm"    />
-        <result property="qytzrxyzdm"    column="qytzrxyzdm"    />
-        <result property="qybj"    column="qybj"    />
-        <result property="tzfjj"    column="tzfjj"    />
-        <result property="sndxse"    column="sndxse"    />
-        <result property="sndnse"    column="sndnse"    />
-        <result property="tzrxm"    column="tzrxm"    />
-        <result property="tzrzw"    column="tzrzw"    />
-        <result property="tzrdh"    column="tzrdh"    />
-        <result property="xmjj"    column="xmjj"    />
-        <result property="name"    column="name"    />
-        <result property="strq"    column="strq"    />
-        <result property="phone"    column="phone"    />
-        <result property="zw"    column="zw"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="type"    column="type"    />
-        <result property="progress"    column="progress"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="isDel"    column="is_del"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="cjdId"    column="cjd_id"    />
-        <result property="cjdName"    column="cjd_name"    />
-        <result property="isMeet"    column="is_meet"    />
-        <result property="meetRemark"    column="meet_remark"    />
+        <result property="id" column="id"/>
+        <result property="sbdw" column="sbdw"/>
+        <result property="tbrq" column="tbrq"/>
+        <result property="zszxfzr" column="zszxfzr"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="xmxsmc" column="xmxsmc"/>
+        <result property="sfwlhxxxm" column="sfwlhxxxm"/>
+        <result property="yzdqId" column="yzdq_id"/>
+        <result property="yzdqName" column="yzdq_name"/>
+        <result property="yzssName" column="yzss_name"/>
+        <result property="ntze" column="ntze"/>
+        <result property="cylxId" column="cylx_id"/>
+        <result property="cylxName" column="cylx_name"/>
+        <result property="xmlb" column="xmlb"/>
+        <result property="tzlb" column="tzlb"/>
+        <result property="nlhd" column="nlhd"/>
+        <result property="czpt" column="czpt"/>
+        <result property="tzzt" column="tzzt"/>
+        <result property="xmjz" column="xmjz"/>
+        <result property="gtzzrsfzhm" column="gtzzrsfzhm"/>
+        <result property="qytzrxyzdm" column="qytzrxyzdm"/>
+        <result property="qybj" column="qybj"/>
+        <result property="tzfjj" column="tzfjj"/>
+        <result property="sndxse" column="sndxse"/>
+        <result property="sndnse" column="sndnse"/>
+        <result property="tzrxm" column="tzrxm"/>
+        <result property="tzrzw" column="tzrzw"/>
+        <result property="tzrdh" column="tzrdh"/>
+        <result property="xmjj" column="xmjj"/>
+        <result property="name" column="name"/>
+        <result property="strq" column="strq"/>
+        <result property="phone" column="phone"/>
+        <result property="zw" column="zw"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="type" column="type"/>
+        <result property="progress" column="progress"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="isDel" column="is_del"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="cjdId" column="cjd_id"/>
+        <result property="cjdName" column="cjd_name"/>
+        <result property="isMeet" column="is_meet"/>
+        <result property="meetRemark" column="meet_remark"/>
     </resultMap>
 
     <sql id="selectZsyzSbbzbVo">
@@ -60,56 +60,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZsyzSbbzbList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
         <include refid="selectZsyzSbbzbVo"/>
-        <where>  
-            <if test="sbdw != null  and sbdw != ''"> and sbdw = #{sbdw}</if>
-            <if test="tbrq != null "> and tbrq = #{tbrq}</if>
-            <if test="zszxfzr != null  and zszxfzr != ''"> and zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''"> and xmxsmc = #{xmxsmc}</if>
-            <if test="sfwlhxxxm != null  and sfwlhxxxm != ''"> and sfwlhxxxm = #{sfwlhxxxm}</if>
-            <if test="yzdqId != null  and yzdqId != ''"> and yzdq_id = #{yzdqId}</if>
-            <if test="yzdqName != null  and yzdqName != ''"> and yzdq_name like concat('%', #{yzdqName}, '%')</if>
-            <if test="yzssName != null  and yzssName != ''"> and yzss_name like concat('%', #{yzssName}, '%')</if>
-            <if test="ntze != null  and ntze != ''"> and ntze = #{ntze}</if>
-            <if test="cylxId != null  and cylxId != ''"> and cylx_id = #{cylxId}</if>
-            <if test="cylxName != null  and cylxName != ''"> and cylx_name like concat('%', #{cylxName}, '%')</if>
-            <if test="xmlb != null  and xmlb != ''"> and xmlb = #{xmlb}</if>
-            <if test="tzlb != null  and tzlb != ''"> and tzlb = #{tzlb}</if>
-            <if test="nlhd != null  and nlhd != ''"> and nlhd = #{nlhd}</if>
-            <if test="czpt != null  and czpt != ''"> and czpt = #{czpt}</if>
-            <if test="tzzt != null  and tzzt != ''"> and tzzt = #{tzzt}</if>
-            <if test="xmjz != null  and xmjz != ''"> and xmjz = #{xmjz}</if>
-            <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''"> and gtzzrsfzhm = #{gtzzrsfzhm}</if>
-            <if test="qytzrxyzdm != null  and qytzrxyzdm != ''"> and qytzrxyzdm = #{qytzrxyzdm}</if>
-            <if test="qybj != null  and qybj != ''"> and qybj = #{qybj}</if>
-            <if test="tzfjj != null  and tzfjj != ''"> and tzfjj = #{tzfjj}</if>
-            <if test="sndxse != null  and sndxse != ''"> and sndxse = #{sndxse}</if>
-            <if test="sndnse != null  and sndnse != ''"> and sndnse = #{sndnse}</if>
-            <if test="tzrxm != null  and tzrxm != ''"> and tzrxm = #{tzrxm}</if>
-            <if test="tzrzw != null  and tzrzw != ''"> and tzrzw = #{tzrzw}</if>
-            <if test="tzrdh != null  and tzrdh != ''"> and tzrdh = #{tzrdh}</if>
-            <if test="xmjj != null  and xmjj != ''"> and xmjj = #{xmjj}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="strq != null "> and strq = #{strq}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="zw != null  and zw != ''"> and zw = #{zw}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
-            <if test="cjdId != null "> and cjd_id = #{cjdId}</if>
-            <if test="cjdName != null  and cjdName != ''"> and cjd_name like concat('%', #{cjdName}, '%')</if>
-            <if test="isMeet != null  and isMeet != ''"> and is_meet = #{isMeet}</if>
-            <if test="meetRemark != null  and meetRemark != ''"> and meet_remark = #{meetRemark}</if>
+        <where>
+            is_del = 'N'
+            <if test="sbdw != null  and sbdw != ''">and sbdw = #{sbdw}</if>
+            <if test="tbrq != null ">and tbrq = #{tbrq}</if>
+            <if test="zszxfzr != null  and zszxfzr != ''">and zszxfzr = #{zszxfzr}</if>
+            <if test="xmbh != null  and xmbh != ''">and xmbh = #{xmbh}</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
+            <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and sfwlhxxxm = #{sfwlhxxxm}</if>
+            <if test="yzdqId != null  and yzdqId != ''">and yzdq_id = #{yzdqId}</if>
+            <if test="yzdqName != null  and yzdqName != ''">and yzdq_name like concat('%', #{yzdqName}, '%')</if>
+            <if test="yzssName != null  and yzssName != ''">and yzss_name like concat('%', #{yzssName}, '%')</if>
+            <if test="ntze != null  and ntze != ''">and ntze = #{ntze}</if>
+            <if test="cylxId != null  and cylxId != ''">and cylx_id = #{cylxId}</if>
+            <if test="cylxName != null  and cylxName != ''">and cylx_name like concat('%', #{cylxName}, '%')</if>
+            <if test="xmlb != null  and xmlb != ''">and xmlb = #{xmlb}</if>
+            <if test="tzlb != null  and tzlb != ''">and tzlb = #{tzlb}</if>
+            <if test="nlhd != null  and nlhd != ''">and nlhd = #{nlhd}</if>
+            <if test="czpt != null  and czpt != ''">and czpt = #{czpt}</if>
+            <if test="tzzt != null  and tzzt != ''">and tzzt = #{tzzt}</if>
+            <if test="xmjz != null  and xmjz != ''">and xmjz = #{xmjz}</if>
+            <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''">and gtzzrsfzhm = #{gtzzrsfzhm}</if>
+            <if test="qytzrxyzdm != null  and qytzrxyzdm != ''">and qytzrxyzdm = #{qytzrxyzdm}</if>
+            <if test="qybj != null  and qybj != ''">and qybj = #{qybj}</if>
+            <if test="tzfjj != null  and tzfjj != ''">and tzfjj = #{tzfjj}</if>
+            <if test="sndxse != null  and sndxse != ''">and sndxse = #{sndxse}</if>
+            <if test="sndnse != null  and sndnse != ''">and sndnse = #{sndnse}</if>
+            <if test="tzrxm != null  and tzrxm != ''">and tzrxm = #{tzrxm}</if>
+            <if test="tzrzw != null  and tzrzw != ''">and tzrzw = #{tzrzw}</if>
+            <if test="tzrdh != null  and tzrdh != ''">and tzrdh = #{tzrdh}</if>
+            <if test="xmjj != null  and xmjj != ''">and xmjj = #{xmjj}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="strq != null ">and strq = #{strq}</if>
+            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
+            <if test="zw != null  and zw != ''">and zw = #{zw}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="type != null  and type != ''">and type = #{type}</if>
+            <if test="progress != null  and progress != ''">and progress = #{progress}</if>
+            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="isDel != null  and isDel != ''">and is_del = #{isDel}</if>
+            <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
+            <if test="cjdName != null  and cjdName != ''">and cjd_name like concat('%', #{cjdName}, '%')</if>
+            <if test="isMeet != null  and isMeet != ''">and is_meet = #{isMeet}</if>
+            <if test="meetRemark != null  and meetRemark != ''">and meet_remark = #{meetRemark}</if>
         </where>
     </select>
-    
+
     <select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
         <include refid="selectZsyzSbbzbVo"/>
-        where id = #{id}
+        where id = #{id} and is_del = 'N'
     </select>
-        
+
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_sbbzb
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -159,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cjdName != null">cjd_name,</if>
             <if test="isMeet != null">is_meet,</if>
             <if test="meetRemark != null">meet_remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbdw != null and sbdw != ''">#{sbdw},</if>
             <if test="tbrq != null">#{tbrq},</if>
@@ -207,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cjdName != null">#{cjdName},</if>
             <if test="isMeet != null">#{isMeet},</if>
             <if test="meetRemark != null">#{meetRemark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateZsyzSbbzb" parameterType="ZsyzSbbzb">
@@ -262,13 +263,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <update id="updateZsyzSbbzbCjd" parameterType="ZsyzSbbzb">
+                update zsyz_sbbzb set cjd_id = #{cjdId},cjd_name = #{cjdName} where id = #{id}
+    </update>
+    <update id="updateZsyzSbbzbForZc" parameterType="ZsyzSbbzb">
+        update zsyz_sbbzb
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="type != null and type != ''">type = #{type},</if>
+            <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
+        </trim>
+      where id = #{id}
+    </update>
 
     <delete id="deleteZsyzSbbzbById" parameterType="Long">
         delete from zsyz_sbbzb where id = #{id}
     </delete>
 
     <delete id="deleteZsyzSbbzbByIds" parameterType="String">
-        delete from zsyz_sbbzb where id in 
+        delete from zsyz_sbbzb where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>