fix 新增V2版本项目申报/签约/开工/投产代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzFjController.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.ZsyzFj;
+import com.ruoyi.system.service.projectV2.IZsyzFjService;
+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 博曼
+ * @date 2023-02-22
+ */
+@RestController
+@RequestMapping("/projectV2/fj")
+public class ZsyzFjController extends BaseController
+{
+    @Autowired
+    private IZsyzFjService zsyzFjService;
+
+    /**
+     * 查询招商引资_附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:fj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzFj zsyzFj)
+    {
+        startPage();
+        List<ZsyzFj> list = zsyzFjService.selectZsyzFjList(zsyzFj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:fj:export')")
+    @Log(title = "招商引资_附件", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(ZsyzFj zsyzFj)
+    {
+        List<ZsyzFj> list = zsyzFjService.selectZsyzFjList(zsyzFj);
+        ExcelUtil<ZsyzFj> util = new ExcelUtil<ZsyzFj>(ZsyzFj.class);
+        return util.exportExcel(list, "fj");
+    }
+
+    /**
+     * 获取招商引资_附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:fj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(zsyzFjService.selectZsyzFjById(id));
+    }
+
+    /**
+     * 新增招商引资_附件
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:fj:add')")
+    @Log(title = "招商引资_附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzFj zsyzFj)
+    {
+        return toAjax(zsyzFjService.insertZsyzFj(zsyzFj));
+    }
+
+    /**
+     * 修改招商引资_附件
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:fj:edit')")
+    @Log(title = "招商引资_附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzFj zsyzFj)
+    {
+        return toAjax(zsyzFjService.updateZsyzFj(zsyzFj));
+    }
+
+    /**
+     * 删除招商引资_附件
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:fj:remove')")
+    @Log(title = "招商引资_附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzFjService.deleteZsyzFjByIds(ids));
+    }
+}

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

@@ -85,7 +85,7 @@ public class ZsyzKgxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:kgxx:edit')")
     @Log(title = "招商引资_开工信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzKgxx zsyzKgxx)
     {
         return toAjax(zsyzKgxxService.updateZsyzKgxx(zsyzKgxx));
@@ -96,7 +96,7 @@ public class ZsyzKgxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:kgxx:remove')")
     @Log(title = "招商引资_开工信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzKgxxService.deleteZsyzKgxxByIds(ids));

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

@@ -84,7 +84,7 @@ public class ZsyzQyxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:qyxx:edit')")
     @Log(title = "招商引资_签约信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzQyxx zsyzQyxx)
     {
         return toAjax(zsyzQyxxService.updateZsyzQyxx(zsyzQyxx));
@@ -95,7 +95,7 @@ public class ZsyzQyxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:qyxx:remove')")
     @Log(title = "招商引资_签约信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzQyxxService.deleteZsyzQyxxByIds(ids));

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.projectV2;
 
 import java.util.List;
+
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
@@ -24,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 招商引资_申报_首谈信息_主Controller
  * 
  * @author boman
- * @date 2023-02-22
+ * @date 2023-02-23
  */
 @RestController
 @RequestMapping("/projectV2/sbbzb")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzShyjController.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.ZsyzShyj;
+import com.ruoyi.system.service.projectV2.IZsyzShyjService;
+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 博曼
+ * @date 2023-02-22
+ */
+@RestController
+@RequestMapping("/projectV2/shyj")
+public class ZsyzShyjController extends BaseController
+{
+    @Autowired
+    private IZsyzShyjService zsyzShyjService;
+
+    /**
+     * 查询招商引资_审核意见列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:shyj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzShyj zsyzShyj)
+    {
+        startPage();
+        List<ZsyzShyj> list = zsyzShyjService.selectZsyzShyjList(zsyzShyj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_审核意见列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:shyj:export')")
+    @Log(title = "招商引资_审核意见", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(ZsyzShyj zsyzShyj)
+    {
+        List<ZsyzShyj> list = zsyzShyjService.selectZsyzShyjList(zsyzShyj);
+        ExcelUtil<ZsyzShyj> util = new ExcelUtil<ZsyzShyj>(ZsyzShyj.class);
+        return util.exportExcel(list, "shyj");
+    }
+
+    /**
+     * 获取招商引资_审核意见详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:shyj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(zsyzShyjService.selectZsyzShyjById(id));
+    }
+
+    /**
+     * 新增招商引资_审核意见
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:shyj:add')")
+    @Log(title = "招商引资_审核意见", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzShyj zsyzShyj)
+    {
+        return toAjax(zsyzShyjService.insertZsyzShyj(zsyzShyj));
+    }
+
+    /**
+     * 修改招商引资_审核意见
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:shyj:edit')")
+    @Log(title = "招商引资_审核意见", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZsyzShyj zsyzShyj)
+    {
+        return toAjax(zsyzShyjService.updateZsyzShyj(zsyzShyj));
+    }
+
+    /**
+     * 删除招商引资_审核意见
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:shyj:remove')")
+    @Log(title = "招商引资_审核意见", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzShyjService.deleteZsyzShyjByIds(ids));
+    }
+}

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

@@ -85,7 +85,7 @@ public class ZsyzTcxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:tcxx:edit')")
     @Log(title = "招商引资_投产信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzTcxx zsyzTcxx)
     {
         return toAjax(zsyzTcxxService.updateZsyzTcxx(zsyzTcxx));
@@ -96,7 +96,7 @@ public class ZsyzTcxxController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('projectV2:tcxx:remove')")
     @Log(title = "招商引资_投产信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzTcxxService.deleteZsyzTcxxByIds(ids));

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

@@ -0,0 +1,122 @@
+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_fj
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+public class ZsyzFj 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;
+
+    /** 目标数据id */
+    @Excel(name = "目标数据id")
+    private Long sourceId;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String fjName;
+
+    /** 附件地址 */
+    @Excel(name = "附件地址")
+    private String path;
+
+    /** 地址类型 1：首谈信息附件，2：签约信息附件，3：开工信息附件，4：投产信息附件 */
+    @Excel(name = "地址类型 1：首谈信息附件，2：签约信息附件，3：开工信息附件，4：投产信息附件")
+    private String type;
+
+    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 setSourceId(Long sourceId) 
+    {
+        this.sourceId = sourceId;
+    }
+
+    public Long getSourceId() 
+    {
+        return sourceId;
+    }
+    public void setFjName(String fjName) 
+    {
+        this.fjName = fjName;
+    }
+
+    public String getFjName() 
+    {
+        return fjName;
+    }
+    public void setPath(String path) 
+    {
+        this.path = path;
+    }
+
+    public String getPath() 
+    {
+        return path;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("sourceId", getSourceId())
+            .append("fjName", getFjName())
+            .append("path", getPath())
+            .append("type", getType())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 招商引资_申报_首谈信息_主对象 zsyz_sbbzb
  * 
  * @author boman
- * @date 2023-02-22
+ * @date 2023-02-23
  */
 public class ZsyzSbbzb extends BaseEntity
 {
@@ -150,6 +150,42 @@ public class ZsyzSbbzb extends BaseEntity
     @Excel(name = "首谈人职务")
     private String zw;
 
+    /** 申请人用户ID */
+    @Excel(name = "申请人用户ID")
+    private Long userId;
+
+    /** 申报状态 1:正常 2:暂缓 */
+    @Excel(name = "申报状态 1:正常 2:暂缓")
+    private String type;
+
+    /** 项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归 */
+    @Excel(name = "项目进度 1:项目首谈待审核 2:项目首谈已审核 3:线索分发要素部门 4:线索已指派 5:线索已承接 6:签约待审核 7:签约已审核 8:开工待审核 9:开工已审核 10:投产待审核 11:投产已审核 12:项目已入归")
+    private String progress;
+
+    /** 申请人部门ID */
+    @Excel(name = "申请人部门ID")
+    private Long deptId;
+
+    /** 是否删除 N:否 Y:是 */
+    @Excel(name = "是否删除 N:否 Y:是")
+    private String isDel;
+
+    /** 承接地id */
+    @Excel(name = "承接地id")
+    private Long cjdId;
+
+    /** 承接地部门名称 */
+    @Excel(name = "承接地部门名称")
+    private String cjdName;
+
+    /** 是否需要会议支持 N:否 Y:是 */
+    @Excel(name = "是否需要会议支持 N:否 Y:是")
+    private String isMeet;
+
+    /** 会议申请备注 */
+    @Excel(name = "会议申请备注")
+    private String meetRemark;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -447,6 +483,87 @@ public class ZsyzSbbzb extends BaseEntity
     {
         return zw;
     }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setProgress(String progress) 
+    {
+        this.progress = progress;
+    }
+
+    public String getProgress() 
+    {
+        return progress;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setCjdId(Long cjdId) 
+    {
+        this.cjdId = cjdId;
+    }
+
+    public Long getCjdId() 
+    {
+        return cjdId;
+    }
+    public void setCjdName(String cjdName) 
+    {
+        this.cjdName = cjdName;
+    }
+
+    public String getCjdName() 
+    {
+        return cjdName;
+    }
+    public void setIsMeet(String isMeet) 
+    {
+        this.isMeet = isMeet;
+    }
+
+    public String getIsMeet() 
+    {
+        return isMeet;
+    }
+    public void setMeetRemark(String meetRemark) 
+    {
+        this.meetRemark = meetRemark;
+    }
+
+    public String getMeetRemark() 
+    {
+        return meetRemark;
+    }
 
     @Override
     public String toString() {
@@ -484,11 +601,20 @@ public class ZsyzSbbzb extends BaseEntity
             .append("strq", getStrq())
             .append("phone", getPhone())
             .append("zw", getZw())
+            .append("userId", getUserId())
             .append("createBy", getCreateBy())
+            .append("type", getType())
+            .append("progress", getProgress())
+            .append("deptId", getDeptId())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
+            .append("isDel", getIsDel())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("cjdId", getCjdId())
+            .append("cjdName", getCjdName())
+            .append("isMeet", getIsMeet())
+            .append("meetRemark", getMeetRemark())
             .toString();
     }
 }

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

@@ -0,0 +1,154 @@
+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_shyj
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+public class ZsyzShyj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String xmbh;
+
+    /** 审核人id */
+    @Excel(name = "审核人id")
+    private Long shrId;
+
+    /** 审核人姓名 */
+    @Excel(name = "审核人姓名")
+    private String shrxm;
+
+    /** 项目阶段 */
+    @Excel(name = "项目阶段")
+    private String xmjd;
+
+    /** 审核结果（是否通过  1：通过，2：拒绝） */
+    @Excel(name = "审核结果", readConverterExp = "是=否通过,1=：通过，2：拒绝")
+    private String shjg;
+
+    /** 审核意见 */
+    @Excel(name = "审核意见")
+    private String shyj;
+
+    /** 审核时间 */
+    @Excel(name = "审核时间")
+    private String shsj;
+
+    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 setShrId(Long shrId) 
+    {
+        this.shrId = shrId;
+    }
+
+    public Long getShrId() 
+    {
+        return shrId;
+    }
+    public void setShrxm(String shrxm) 
+    {
+        this.shrxm = shrxm;
+    }
+
+    public String getShrxm() 
+    {
+        return shrxm;
+    }
+    public void setXmjd(String xmjd) 
+    {
+        this.xmjd = xmjd;
+    }
+
+    public String getXmjd() 
+    {
+        return xmjd;
+    }
+    public void setShjg(String shjg) 
+    {
+        this.shjg = shjg;
+    }
+
+    public String getShjg() 
+    {
+        return shjg;
+    }
+    public void setShyj(String shyj) 
+    {
+        this.shyj = shyj;
+    }
+
+    public String getShyj() 
+    {
+        return shyj;
+    }
+    public void setShsj(String shsj) 
+    {
+        this.shsj = shsj;
+    }
+
+    public String getShsj() 
+    {
+        return shsj;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("shrId", getShrId())
+            .append("shrxm", getShrxm())
+            .append("xmjd", getXmjd())
+            .append("shjg", getShjg())
+            .append("shyj", getShyj())
+            .append("shsj", getShsj())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzFj;
+import java.util.List;
+
+
+/**
+ * 招商引资_附件Mapper接口
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+public interface ZsyzFjMapper 
+{
+    /**
+     * 查询招商引资_附件
+     * 
+     * @param id 招商引资_附件ID
+     * @return 招商引资_附件
+     */
+    public ZsyzFj selectZsyzFjById(Long id);
+
+    /**
+     * 查询招商引资_附件列表
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 招商引资_附件集合
+     */
+    public List<ZsyzFj> selectZsyzFjList(ZsyzFj zsyzFj);
+
+    /**
+     * 新增招商引资_附件
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 结果
+     */
+    public int insertZsyzFj(ZsyzFj zsyzFj);
+
+    /**
+     * 修改招商引资_附件
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 结果
+     */
+    public int updateZsyzFj(ZsyzFj zsyzFj);
+
+    /**
+     * 删除招商引资_附件
+     * 
+     * @param id 招商引资_附件ID
+     * @return 结果
+     */
+    public int deleteZsyzFjById(Long id);
+
+    /**
+     * 批量删除招商引资_附件
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteZsyzFjByIds(Long[] ids);
+}

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

@@ -1,14 +1,14 @@
 package com.ruoyi.system.mapper.projectV2;
 
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
-import java.util.List;
 
+import java.util.List;
 
 /**
  * 招商引资_申报_首谈信息_主Mapper接口
  * 
  * @author boman
- * @date 2023-02-22
+ * @date 2023-02-23
  */
 public interface ZsyzSbbzbMapper 
 {

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzShyj;
+
+import java.util.List;
+
+/**
+ * 招商引资_审核意见Mapper接口
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+public interface ZsyzShyjMapper 
+{
+    /**
+     * 查询招商引资_审核意见
+     * 
+     * @param id 招商引资_审核意见ID
+     * @return 招商引资_审核意见
+     */
+    public ZsyzShyj selectZsyzShyjById(Long id);
+
+    /**
+     * 查询招商引资_审核意见列表
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 招商引资_审核意见集合
+     */
+    public List<ZsyzShyj> selectZsyzShyjList(ZsyzShyj zsyzShyj);
+
+    /**
+     * 新增招商引资_审核意见
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 结果
+     */
+    public int insertZsyzShyj(ZsyzShyj zsyzShyj);
+
+    /**
+     * 修改招商引资_审核意见
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 结果
+     */
+    public int updateZsyzShyj(ZsyzShyj zsyzShyj);
+
+    /**
+     * 删除招商引资_审核意见
+     * 
+     * @param id 招商引资_审核意见ID
+     * @return 结果
+     */
+    public int deleteZsyzShyjById(Long id);
+
+    /**
+     * 批量删除招商引资_审核意见
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteZsyzShyjByIds(Long[] ids);
+}

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

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+
+import com.ruoyi.system.domain.projectV2.ZsyzFj;
+import com.ruoyi.system.mapper.projectV2.ZsyzFjMapper;
+import com.ruoyi.system.service.projectV2.IZsyzFjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 招商引资_附件Service业务层处理
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+@Service
+public class ZsyzFjServiceImpl implements IZsyzFjService
+{
+    @Autowired
+    private ZsyzFjMapper zsyzFjMapper;
+
+    /**
+     * 查询招商引资_附件
+     * 
+     * @param id 招商引资_附件ID
+     * @return 招商引资_附件
+     */
+    @Override
+    public ZsyzFj selectZsyzFjById(Long id)
+    {
+        return zsyzFjMapper.selectZsyzFjById(id);
+    }
+
+    /**
+     * 查询招商引资_附件列表
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 招商引资_附件
+     */
+    @Override
+    public List<ZsyzFj> selectZsyzFjList(ZsyzFj zsyzFj)
+    {
+        return zsyzFjMapper.selectZsyzFjList(zsyzFj);
+    }
+
+    /**
+     * 新增招商引资_附件
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzFj(ZsyzFj zsyzFj)
+    {
+        return zsyzFjMapper.insertZsyzFj(zsyzFj);
+    }
+
+    /**
+     * 修改招商引资_附件
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzFj(ZsyzFj zsyzFj)
+    {
+        return zsyzFjMapper.updateZsyzFj(zsyzFj);
+    }
+
+    /**
+     * 批量删除招商引资_附件
+     * 
+     * @param ids 需要删除的招商引资_附件ID
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzFjByIds(Long[] ids)
+    {
+        return zsyzFjMapper.deleteZsyzFjByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_附件信息
+     * 
+     * @param id 招商引资_附件ID
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzFjById(Long id)
+    {
+        return zsyzFjMapper.deleteZsyzFjById(id);
+    }
+}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * 招商引资_申报_首谈信息_主Service业务层处理
  * 
  * @author boman
- * @date 2023-02-22
+ * @date 2023-02-23
  */
 @Service
 public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzShyjServiceImpl.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.ZsyzShyj;
+import com.ruoyi.system.mapper.projectV2.ZsyzShyjMapper;
+import com.ruoyi.system.service.projectV2.IZsyzShyjService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 招商引资_审核意见Service业务层处理
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+@Service
+public class ZsyzShyjServiceImpl implements IZsyzShyjService
+{
+    @Autowired
+    private ZsyzShyjMapper zsyzShyjMapper;
+
+    /**
+     * 查询招商引资_审核意见
+     * 
+     * @param id 招商引资_审核意见ID
+     * @return 招商引资_审核意见
+     */
+    @Override
+    public ZsyzShyj selectZsyzShyjById(Long id)
+    {
+        return zsyzShyjMapper.selectZsyzShyjById(id);
+    }
+
+    /**
+     * 查询招商引资_审核意见列表
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 招商引资_审核意见
+     */
+    @Override
+    public List<ZsyzShyj> selectZsyzShyjList(ZsyzShyj zsyzShyj)
+    {
+        return zsyzShyjMapper.selectZsyzShyjList(zsyzShyj);
+    }
+
+    /**
+     * 新增招商引资_审核意见
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzShyj(ZsyzShyj zsyzShyj)
+    {
+        zsyzShyj.setCreateTime(DateUtils.getNowDate());
+        return zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
+    }
+
+    /**
+     * 修改招商引资_审核意见
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzShyj(ZsyzShyj zsyzShyj)
+    {
+        zsyzShyj.setUpdateTime(DateUtils.getNowDate());
+        return zsyzShyjMapper.updateZsyzShyj(zsyzShyj);
+    }
+
+    /**
+     * 批量删除招商引资_审核意见
+     * 
+     * @param ids 需要删除的招商引资_审核意见ID
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzShyjByIds(Long[] ids)
+    {
+        return zsyzShyjMapper.deleteZsyzShyjByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_审核意见信息
+     * 
+     * @param id 招商引资_审核意见ID
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzShyjById(Long id)
+    {
+        return zsyzShyjMapper.deleteZsyzShyjById(id);
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzFj;
+import java.util.List;
+
+/**
+ * 招商引资_附件Service接口
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+public interface IZsyzFjService 
+{
+    /**
+     * 查询招商引资_附件
+     * 
+     * @param id 招商引资_附件ID
+     * @return 招商引资_附件
+     */
+    public ZsyzFj selectZsyzFjById(Long id);
+
+    /**
+     * 查询招商引资_附件列表
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 招商引资_附件集合
+     */
+    public List<ZsyzFj> selectZsyzFjList(ZsyzFj zsyzFj);
+
+    /**
+     * 新增招商引资_附件
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 结果
+     */
+    public int insertZsyzFj(ZsyzFj zsyzFj);
+
+    /**
+     * 修改招商引资_附件
+     * 
+     * @param zsyzFj 招商引资_附件
+     * @return 结果
+     */
+    public int updateZsyzFj(ZsyzFj zsyzFj);
+
+    /**
+     * 批量删除招商引资_附件
+     * 
+     * @param ids 需要删除的招商引资_附件ID
+     * @return 结果
+     */
+    public int deleteZsyzFjByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_附件信息
+     * 
+     * @param id 招商引资_附件ID
+     * @return 结果
+     */
+    public int deleteZsyzFjById(Long id);
+}

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

@@ -1,13 +1,14 @@
 package com.ruoyi.system.service.projectV2;
 
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
+
 import java.util.List;
 
 /**
  * 招商引资_申报_首谈信息_主Service接口
  * 
  * @author boman
- * @date 2023-02-22
+ * @date 2023-02-23
  */
 public interface IZsyzSbbzbService 
 {

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzShyj;
+
+import java.util.List;
+
+/**
+ * 招商引资_审核意见Service接口
+ * 
+ * @author 博曼
+ * @date 2023-02-22
+ */
+public interface IZsyzShyjService 
+{
+    /**
+     * 查询招商引资_审核意见
+     * 
+     * @param id 招商引资_审核意见ID
+     * @return 招商引资_审核意见
+     */
+    public ZsyzShyj selectZsyzShyjById(Long id);
+
+    /**
+     * 查询招商引资_审核意见列表
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 招商引资_审核意见集合
+     */
+    public List<ZsyzShyj> selectZsyzShyjList(ZsyzShyj zsyzShyj);
+
+    /**
+     * 新增招商引资_审核意见
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 结果
+     */
+    public int insertZsyzShyj(ZsyzShyj zsyzShyj);
+
+    /**
+     * 修改招商引资_审核意见
+     * 
+     * @param zsyzShyj 招商引资_审核意见
+     * @return 结果
+     */
+    public int updateZsyzShyj(ZsyzShyj zsyzShyj);
+
+    /**
+     * 批量删除招商引资_审核意见
+     * 
+     * @param ids 需要删除的招商引资_审核意见ID
+     * @return 结果
+     */
+    public int deleteZsyzShyjByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_审核意见信息
+     * 
+     * @param id 招商引资_审核意见ID
+     * @return 结果
+     */
+    public int deleteZsyzShyjById(Long id);
+}

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

@@ -0,0 +1,85 @@
+<?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.ZsyzFjMapper">
+    
+    <resultMap type="ZsyzFj" id="ZsyzFjResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="sourceId"    column="source_id"    />
+        <result property="fjName"    column="fj_name"    />
+        <result property="path"    column="path"    />
+        <result property="type"    column="type"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectZsyzFjVo">
+        select id, xm_id, xmbh, source_id, fj_name, path, type, remark from zsyz_fj
+    </sql>
+
+    <select id="selectZsyzFjList" parameterType="ZsyzFj" resultMap="ZsyzFjResult">
+        <include refid="selectZsyzFjVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="sourceId != null "> and source_id = #{sourceId}</if>
+            <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
+            <if test="path != null  and path != ''"> and path = #{path}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzFjById" parameterType="Long" resultMap="ZsyzFjResult">
+        <include refid="selectZsyzFjVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzFj" parameterType="ZsyzFj" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_fj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="sourceId != null">source_id,</if>
+            <if test="fjName != null and fjName != ''">fj_name,</if>
+            <if test="path != null">path,</if>
+            <if test="type != null">type,</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="sourceId != null">#{sourceId},</if>
+            <if test="fjName != null and fjName != ''">#{fjName},</if>
+            <if test="path != null">#{path},</if>
+            <if test="type != null">#{type},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZsyzFj" parameterType="ZsyzFj">
+        update zsyz_fj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="sourceId != null">source_id = #{sourceId},</if>
+            <if test="fjName != null and fjName != ''">fj_name = #{fjName},</if>
+            <if test="path != null">path = #{path},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteZsyzFjById" parameterType="Long">
+        delete from zsyz_fj where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzFjByIds" parameterType="String">
+        delete from zsyz_fj 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

@@ -38,15 +38,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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">
-        select id, sbdw, tbrq, zszxfzr, xmbh, xmxsmc, sfwlhxxxm, yzdq_id, yzdq_name, yzss_name, ntze, cylx_id, cylx_name, xmlb, tzlb, nlhd, czpt, tzzt, xmjz, gtzzrsfzhm, qytzrxyzdm, qybj, tzfjj, sndxse, sndnse, tzrxm, tzrzw, tzrdh, xmjj, name, strq, phone, zw, create_by, create_time, update_by, update_time, remark from zsyz_sbbzb
+        select id, sbdw, tbrq, zszxfzr, xmbh, xmxsmc, sfwlhxxxm, yzdq_id, yzdq_name, yzss_name, ntze, cylx_id, cylx_name, xmlb, tzlb, nlhd, czpt, tzzt, xmjz, gtzzrsfzhm, qytzrxyzdm, qybj, tzfjj, sndxse, sndnse, tzrxm, tzrzw, tzrdh, xmjj, name, strq, phone, zw, user_id, create_by, type, progress, dept_id, create_time, update_by, is_del, update_time, remark, cjd_id, cjd_name, is_meet, meet_remark from zsyz_sbbzb
     </sql>
 
     <select id="selectZsyzSbbzbList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
@@ -84,6 +93,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
     
@@ -127,11 +145,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="strq != null">strq,</if>
             <if test="phone != null and phone != ''">phone,</if>
             <if test="zw != null and zw != ''">zw,</if>
+            <if test="userId != null">user_id,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="type != null">type,</if>
+            <if test="progress != null">progress,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="isDel != null">is_del,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="cjdId != null">cjd_id,</if>
+            <if test="cjdName != null">cjd_name,</if>
+            <if test="isMeet != null">is_meet,</if>
+            <if test="meetRemark != null">meet_remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbdw != null and sbdw != ''">#{sbdw},</if>
@@ -166,11 +193,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="strq != null">#{strq},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
             <if test="zw != null and zw != ''">#{zw},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="type != null">#{type},</if>
+            <if test="progress != null">#{progress},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="isDel != null">#{isDel},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="cjdId != null">#{cjdId},</if>
+            <if test="cjdName != null">#{cjdName},</if>
+            <if test="isMeet != null">#{isMeet},</if>
+            <if test="meetRemark != null">#{meetRemark},</if>
          </trim>
     </insert>
 
@@ -209,11 +245,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="strq != null">strq = #{strq},</if>
             <if test="phone != null and phone != ''">phone = #{phone},</if>
             <if test="zw != null and zw != ''">zw = #{zw},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="progress != null">progress = #{progress},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="cjdId != null">cjd_id = #{cjdId},</if>
+            <if test="cjdName != null">cjd_name = #{cjdName},</if>
+            <if test="isMeet != null">is_meet = #{isMeet},</if>
+            <if test="meetRemark != null">meet_remark = #{meetRemark},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -0,0 +1,111 @@
+<?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.ZsyzShyjMapper">
+    
+    <resultMap type="ZsyzShyj" id="ZsyzShyjResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="shrId"    column="shr_id"    />
+        <result property="shrxm"    column="shrxm"    />
+        <result property="xmjd"    column="xmjd"    />
+        <result property="shjg"    column="shjg"    />
+        <result property="shyj"    column="shyj"    />
+        <result property="shsj"    column="shsj"    />
+        <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="selectZsyzShyjVo">
+        select id, xm_id, xmbh, shr_id, shrxm, xmjd, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zsyz_shyj
+    </sql>
+
+    <select id="selectZsyzShyjList" parameterType="ZsyzShyj" resultMap="ZsyzShyjResult">
+        <include refid="selectZsyzShyjVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="shrId != null "> and shr_id = #{shrId}</if>
+            <if test="shrxm != null  and shrxm != ''"> and shrxm = #{shrxm}</if>
+            <if test="xmjd != null  and xmjd != ''"> and xmjd = #{xmjd}</if>
+            <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
+            <if test="shyj != null  and shyj != ''"> and shyj = #{shyj}</if>
+            <if test="shsj != null  and shsj != ''"> and shsj = #{shsj}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzShyjById" parameterType="Long" resultMap="ZsyzShyjResult">
+        <include refid="selectZsyzShyjVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzShyj" parameterType="ZsyzShyj" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_shyj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="shrId != null">shr_id,</if>
+            <if test="shrxm != null and shrxm != ''">shrxm,</if>
+            <if test="xmjd != null and xmjd != ''">xmjd,</if>
+            <if test="shjg != null and shjg != ''">shjg,</if>
+            <if test="shyj != null">shyj,</if>
+            <if test="shsj != null">shsj,</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="shrId != null">#{shrId},</if>
+            <if test="shrxm != null and shrxm != ''">#{shrxm},</if>
+            <if test="xmjd != null and xmjd != ''">#{xmjd},</if>
+            <if test="shjg != null and shjg != ''">#{shjg},</if>
+            <if test="shyj != null">#{shyj},</if>
+            <if test="shsj != null">#{shsj},</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="updateZsyzShyj" parameterType="ZsyzShyj">
+        update zsyz_shyj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="shrId != null">shr_id = #{shrId},</if>
+            <if test="shrxm != null and shrxm != ''">shrxm = #{shrxm},</if>
+            <if test="xmjd != null and xmjd != ''">xmjd = #{xmjd},</if>
+            <if test="shjg != null and shjg != ''">shjg = #{shjg},</if>
+            <if test="shyj != null">shyj = #{shyj},</if>
+            <if test="shsj != null">shsj = #{shsj},</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="deleteZsyzShyjById" parameterType="Long">
+        delete from zsyz_shyj where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzShyjByIds" parameterType="String">
+        delete from zsyz_shyj where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>