Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.system.domain.projectV2.ZsyzLcjl;
+import com.ruoyi.system.service.projectV2.IZsyzLcjlService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_流程记录Controller
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+@RestController
+@RequestMapping("/system/lcjl")
+public class ZsyzLcjlController extends BaseController
+{
+    @Autowired
+    private IZsyzLcjlService zsyzLcjlService;
+
+    /**
+     * 查询招商引资_流程记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:lcjl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzLcjl zsyzLcjl)
+    {
+        startPage();
+        List<ZsyzLcjl> list = zsyzLcjlService.selectZsyzLcjlList(zsyzLcjl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_流程记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:lcjl:export')")
+    @Log(title = "招商引资_流程记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzLcjl zsyzLcjl)
+    {
+        List<ZsyzLcjl> list = zsyzLcjlService.selectZsyzLcjlList(zsyzLcjl);
+        ExcelUtil<ZsyzLcjl> util = new ExcelUtil<ZsyzLcjl>(ZsyzLcjl.class);
+        util.exportExcel(response, list, "招商引资_流程记录数据");
+    }
+
+    /**
+     * 获取招商引资_流程记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:lcjl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzLcjlService.selectZsyzLcjlById(id));
+    }
+
+    /**
+     * 新增招商引资_流程记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:lcjl:add')")
+    @Log(title = "招商引资_流程记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzLcjl zsyzLcjl)
+    {
+        return toAjax(zsyzLcjlService.insertZsyzLcjl(zsyzLcjl));
+    }
+
+    /**
+     * 修改招商引资_流程记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:lcjl:edit')")
+    @Log(title = "招商引资_流程记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzLcjl zsyzLcjl)
+    {
+        return toAjax(zsyzLcjlService.updateZsyzLcjl(zsyzLcjl));
+    }
+
+    /**
+     * 删除招商引资_流程记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:lcjl:remove')")
+    @Log(title = "招商引资_流程记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzLcjlService.deleteZsyzLcjlByIds(ids));
+    }
+}

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

@@ -7,11 +7,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxPz;
 import com.ruoyi.system.service.projectV2.IZsyzSbbzbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -56,14 +58,14 @@ public class ZsyzSbbzbController extends BaseController
     /**
      * 导出招商引资_申报_首谈信息_主列表
      */
-    @PreAuthorize("@ss.hasPermi('projectV2:sbbzb:export')")
     @Log(title = "招商引资_申报_首谈信息_主", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(ZsyzSbbzb zsyzSbbzb)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzSbbzb zsyzSbbzb)
     {
         List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbListDc(zsyzSbbzb);
         ExcelUtil<ZsyzSbbzb> util = new ExcelUtil<ZsyzSbbzb>(ZsyzSbbzb.class);
-        return util.exportExcel(list, "sbbzb");
+        util.exportExcel(response, list, "招商引资_项目信息");
+
     }
 
     /**

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.system.domain.projectV2.ZsyzShqxPz;
+import com.ruoyi.system.service.projectV2.IZsyzShqxPzService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_审核期限_配置Controller
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+@RestController
+@RequestMapping("/system/pz")
+public class ZsyzShqxPzController extends BaseController
+{
+    @Autowired
+    private IZsyzShqxPzService zsyzShqxPzService;
+
+    /**
+     * 查询招商引资_审核期限_配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:pz:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzShqxPz zsyzShqxPz)
+    {
+        startPage();
+        List<ZsyzShqxPz> list = zsyzShqxPzService.selectZsyzShqxPzList(zsyzShqxPz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_审核期限_配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:pz:export')")
+    @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzShqxPz zsyzShqxPz)
+    {
+        List<ZsyzShqxPz> list = zsyzShqxPzService.selectZsyzShqxPzList(zsyzShqxPz);
+        ExcelUtil<ZsyzShqxPz> util = new ExcelUtil<ZsyzShqxPz>(ZsyzShqxPz.class);
+        util.exportExcel(response, list, "招商引资_审核期限_配置数据");
+    }
+
+    /**
+     * 获取招商引资_审核期限_配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:pz:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzShqxPzService.selectZsyzShqxPzById(id));
+    }
+
+    /**
+     * 新增招商引资_审核期限_配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:pz:add')")
+    @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzShqxPz zsyzShqxPz)
+    {
+        return toAjax(zsyzShqxPzService.insertZsyzShqxPz(zsyzShqxPz));
+    }
+
+    /**
+     * 修改招商引资_审核期限_配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:pz:edit')")
+    @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzShqxPz zsyzShqxPz)
+    {
+        return toAjax(zsyzShqxPzService.updateZsyzShqxPz(zsyzShqxPz));
+    }
+
+    /**
+     * 删除招商引资_审核期限_配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:pz:remove')")
+    @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzShqxPzService.deleteZsyzShqxPzByIds(ids));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.system.domain.projectV2.ZsyzShqxXm;
+import com.ruoyi.system.service.projectV2.IZsyzShqxXmService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_审核期限_项目Controller
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+@RestController
+@RequestMapping("/system/xm")
+public class ZsyzShqxXmController extends BaseController
+{
+    @Autowired
+    private IZsyzShqxXmService zsyzShqxXmService;
+
+    /**
+     * 查询招商引资_审核期限_项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:xm:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzShqxXm zsyzShqxXm)
+    {
+        startPage();
+        List<ZsyzShqxXm> list = zsyzShqxXmService.selectZsyzShqxXmList(zsyzShqxXm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_审核期限_项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:xm:export')")
+    @Log(title = "招商引资_审核期限_项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzShqxXm zsyzShqxXm)
+    {
+        List<ZsyzShqxXm> list = zsyzShqxXmService.selectZsyzShqxXmList(zsyzShqxXm);
+        ExcelUtil<ZsyzShqxXm> util = new ExcelUtil<ZsyzShqxXm>(ZsyzShqxXm.class);
+        util.exportExcel(response, list, "招商引资_审核期限_项目数据");
+    }
+
+    /**
+     * 获取招商引资_审核期限_项目详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:xm:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzShqxXmService.selectZsyzShqxXmById(id));
+    }
+
+    /**
+     * 新增招商引资_审核期限_项目
+     */
+    @PreAuthorize("@ss.hasPermi('system:xm:add')")
+    @Log(title = "招商引资_审核期限_项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzShqxXm zsyzShqxXm)
+    {
+        return toAjax(zsyzShqxXmService.insertZsyzShqxXm(zsyzShqxXm));
+    }
+
+    /**
+     * 修改招商引资_审核期限_项目
+     */
+    @PreAuthorize("@ss.hasPermi('system:xm:edit')")
+    @Log(title = "招商引资_审核期限_项目", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzShqxXm zsyzShqxXm)
+    {
+        return toAjax(zsyzShqxXmService.updateZsyzShqxXm(zsyzShqxXm));
+    }
+
+    /**
+     * 删除招商引资_审核期限_项目
+     */
+    @PreAuthorize("@ss.hasPermi('system:xm:remove')")
+    @Log(title = "招商引资_审核期限_项目", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzShqxXmService.deleteZsyzShqxXmByIds(ids));
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -8,7 +8,10 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
+
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
@@ -152,7 +155,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算时间差
      *
-     * @param endTime 最后时间
+     * @param endDate 最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
@@ -193,4 +196,39 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+    /**
+     * 计算两个日期之间的工作日天数，包含起始日期，包含终止日期
+     *
+     * @param start  计算开始时间  必须传yyyy-MM-dd的格式
+     * @param stop	计算结束时间  必须传yyyy-MM-dd的格式
+     * @return
+     * @throws ParseException
+     */
+    public static int calc(String start, String stop) throws ParseException {
+
+
+        String pattern = "yyyy-MM-dd";
+        Date begin = DateUtils.parseDate(start, pattern);
+        Date endTime = DateUtils.parseDate(stop, pattern);
+        Calendar cEnd = new GregorianCalendar();
+        cEnd.setTime(endTime);
+        // 计算时算入stop当天
+        cEnd.add(Calendar.DATE,1);
+        Date end=cEnd.getTime();
+        //
+        Calendar c = Calendar.getInstance();
+        c.setTime(begin);
+        int count = 0;
+        String ymd = null;
+        while (c.getTime().before(end)) {
+            ymd = DateFormatUtils.format(c.getTime(), pattern);
+            // 不是法定节假日 是否是法定节假日  0 上班 1周末 2节假日
+            if ("0".equals(HolidayUtils.request(ymd))) {
+                count++;
+            }
+            c.add(Calendar.DATE, 1);
+        }
+        return count;
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/HolidayUtils.java

@@ -0,0 +1,61 @@
+package com.ruoyi.common.utils;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HolidayUtils {
+
+    public static String request( String httpArg) {
+
+        String httpUrl="http://tool.bitefu.net/jiari/";
+
+        BufferedReader reader = null;
+
+        String result = null;
+
+        StringBuffer sbf = new StringBuffer();
+
+        httpUrl = httpUrl + "?d=" + httpArg;
+
+        try {
+
+            URL url = new URL(httpUrl);
+
+            HttpURLConnection connection = (HttpURLConnection) url
+
+                    .openConnection();
+
+            connection.setRequestMethod("GET");
+
+            connection.connect();
+
+            InputStream is = connection.getInputStream();
+
+            reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+            String strRead = null;
+
+            while ((strRead = reader.readLine()) != null) {
+                sbf.append(strRead);
+            }
+
+            reader.close();
+
+            result = sbf.toString();
+
+            //Map map= (Map) JSON.parse(result);
+
+            //String res=(String)map.get(httpArg);
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.ruoyi.system.domain.projectV2;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_lcjl
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public class ZsyzLcjl 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;
+
+    /** 处理部门id */
+    @Excel(name = "处理部门id")
+    private Long deptId;
+
+    /** 处理部门名称 */
+    @Excel(name = "处理部门名称")
+    private String deptName;
+
+    /** 处理日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "处理日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date clTime;
+
+    /** 项目进度 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;
+
+    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 setClTime(Date clTime) 
+    {
+        this.clTime = clTime;
+    }
+
+    public Date getClTime() 
+    {
+        return clTime;
+    }
+    public void setProgress(String progress) 
+    {
+        this.progress = progress;
+    }
+
+    public String getProgress() 
+    {
+        return progress;
+    }
+
+    @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("clTime", getClTime())
+            .append("progress", getProgress())
+            .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

@@ -222,7 +222,7 @@ public class ZsyzSbbzb extends BaseEntity
             @Excel(name = "建设方式", targetAttr = "jsfs", readConverterExp = "1=新建,2=改建,3=扩建,4=租赁"),
             @Excel(name = "租赁厂房(平方米)", targetAttr = "zlcf"),
             @Excel(name = "供地面积(亩)", targetAttr = "gdmj"),
-            @Excel(name = "备注", targetAttr = "remark"),
+           // @Excel(name = "备注", targetAttr = "remark"),
             @Excel(name = "注册日期", targetAttr = "zcrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "注册资本（万元）", targetAttr = "zczb"),
             @Excel(name = "法人代表", targetAttr = "frdb"),
@@ -241,7 +241,7 @@ public class ZsyzSbbzb extends BaseEntity
             @Excel(name = "拟竣工日期", targetAttr = "njgrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "拟投产时间", targetAttr = "ntcsj", width = 30, dateFormat = "yyyy-MM-dd"),
             //@Excel(name = "分期投资情况", targetAttr = "jsnr"), 没有这个字段吧
-            @Excel(name = "备注", targetAttr = "remark")
+            //@Excel(name = "备注", targetAttr = "remark")
     })
     private ZsyzKgxx zsyzKgxx;
 
@@ -255,7 +255,7 @@ public class ZsyzSbbzb extends BaseEntity
             @Excel(name = "设备发票（万元）", targetAttr = "sbfp"),
             //@Excel(name = "新增应税销售额", targetAttr = "xjcf"),
             //@Excel(name = "租赁厂房项目增值税抵扣设备投资额", targetAttr = "xjcf"),
-            @Excel(name = "备注", targetAttr = "remark")
+            //@Excel(name = "备注", targetAttr = "remark")
     })
     private ZsyzTcxx zsyzTcxx;
 

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

@@ -0,0 +1,182 @@
+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_shqx_pz
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public class ZsyzShqxPz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 首谈审核期限 */
+    @Excel(name = "首谈审核期限")
+    private String stshqx;
+
+    /** 要素部门审核期限 */
+    @Excel(name = "要素部门审核期限")
+    private String ysbmshqx;
+
+    /** 承接地承接期限 */
+    @Excel(name = "承接地承接期限")
+    private String cjdcjqx;
+
+    /** 签约信息录入期限 */
+    @Excel(name = "签约信息录入期限")
+    private String qylrqx;
+
+    /** 签约信息审核期限 */
+    @Excel(name = "签约信息审核期限")
+    private String qyshqx;
+
+    /** 开工信息录入期限 */
+    @Excel(name = "开工信息录入期限")
+    private String kglrqx;
+
+    /** 开工信息审核期限 */
+    @Excel(name = "开工信息审核期限")
+    private String kgshqx;
+
+    /** 投产信息录入期限 */
+    @Excel(name = "投产信息录入期限")
+    private String tclrqx;
+
+    /** 投产信息审核期限 */
+    @Excel(name = "投产信息审核期限")
+    private String tcshqx;
+
+    /** 类型（1：黄牌，2：红牌） */
+    @Excel(name = "类型", readConverterExp = "1=：黄牌，2：红牌")
+    private String type;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setStshqx(String stshqx) 
+    {
+        this.stshqx = stshqx;
+    }
+
+    public String getStshqx() 
+    {
+        return stshqx;
+    }
+    public void setYsbmshqx(String ysbmshqx) 
+    {
+        this.ysbmshqx = ysbmshqx;
+    }
+
+    public String getYsbmshqx() 
+    {
+        return ysbmshqx;
+    }
+    public void setCjdcjqx(String cjdcjqx) 
+    {
+        this.cjdcjqx = cjdcjqx;
+    }
+
+    public String getCjdcjqx() 
+    {
+        return cjdcjqx;
+    }
+    public void setQylrqx(String qylrqx) 
+    {
+        this.qylrqx = qylrqx;
+    }
+
+    public String getQylrqx() 
+    {
+        return qylrqx;
+    }
+    public void setQyshqx(String qyshqx) 
+    {
+        this.qyshqx = qyshqx;
+    }
+
+    public String getQyshqx() 
+    {
+        return qyshqx;
+    }
+    public void setKglrqx(String kglrqx) 
+    {
+        this.kglrqx = kglrqx;
+    }
+
+    public String getKglrqx() 
+    {
+        return kglrqx;
+    }
+    public void setKgshqx(String kgshqx) 
+    {
+        this.kgshqx = kgshqx;
+    }
+
+    public String getKgshqx() 
+    {
+        return kgshqx;
+    }
+    public void setTclrqx(String tclrqx) 
+    {
+        this.tclrqx = tclrqx;
+    }
+
+    public String getTclrqx() 
+    {
+        return tclrqx;
+    }
+    public void setTcshqx(String tcshqx) 
+    {
+        this.tcshqx = tcshqx;
+    }
+
+    public String getTcshqx() 
+    {
+        return tcshqx;
+    }
+    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("stshqx", getStshqx())
+            .append("ysbmshqx", getYsbmshqx())
+            .append("cjdcjqx", getCjdcjqx())
+            .append("qylrqx", getQylrqx())
+            .append("qyshqx", getQyshqx())
+            .append("kglrqx", getKglrqx())
+            .append("kgshqx", getKgshqx())
+            .append("tclrqx", getTclrqx())
+            .append("tcshqx", getTcshqx())
+            .append("type", getType())
+            .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/ZsyzShqxXm.java

@@ -0,0 +1,224 @@
+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_shqx_xm
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public class ZsyzShqxXm 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;
+
+    /** 首谈审核期限 */
+    @Excel(name = "首谈审核期限")
+    private String stshqx;
+
+    /** 要素部门审核期限 */
+    @Excel(name = "要素部门审核期限")
+    private String ysbmshqx;
+
+    /** 承接地承接期限 */
+    @Excel(name = "承接地承接期限")
+    private String cjdcjqx;
+
+    /** 签约信息录入期限 */
+    @Excel(name = "签约信息录入期限")
+    private String qylrqx;
+
+    /** 签约信息审核期限 */
+    @Excel(name = "签约信息审核期限")
+    private String qyshqx;
+
+    /** 开工信息录入期限 */
+    @Excel(name = "开工信息录入期限")
+    private String kglrqx;
+
+    /** 开工信息审核期限 */
+    @Excel(name = "开工信息审核期限")
+    private String kgshqx;
+
+    /** 投产信息录入期限 */
+    @Excel(name = "投产信息录入期限")
+    private String tclrqx;
+
+    /** 投产信息审核期限 */
+    @Excel(name = "投产信息审核期限")
+    private String tcshqx;
+
+    /** 类型（1：黄牌，2：红牌） */
+    @Excel(name = "类型", readConverterExp = "1=：黄牌，2：红牌")
+    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 setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setStshqx(String stshqx) 
+    {
+        this.stshqx = stshqx;
+    }
+
+    public String getStshqx() 
+    {
+        return stshqx;
+    }
+    public void setYsbmshqx(String ysbmshqx) 
+    {
+        this.ysbmshqx = ysbmshqx;
+    }
+
+    public String getYsbmshqx() 
+    {
+        return ysbmshqx;
+    }
+    public void setCjdcjqx(String cjdcjqx) 
+    {
+        this.cjdcjqx = cjdcjqx;
+    }
+
+    public String getCjdcjqx() 
+    {
+        return cjdcjqx;
+    }
+    public void setQylrqx(String qylrqx) 
+    {
+        this.qylrqx = qylrqx;
+    }
+
+    public String getQylrqx() 
+    {
+        return qylrqx;
+    }
+    public void setQyshqx(String qyshqx) 
+    {
+        this.qyshqx = qyshqx;
+    }
+
+    public String getQyshqx() 
+    {
+        return qyshqx;
+    }
+    public void setKglrqx(String kglrqx) 
+    {
+        this.kglrqx = kglrqx;
+    }
+
+    public String getKglrqx() 
+    {
+        return kglrqx;
+    }
+    public void setKgshqx(String kgshqx) 
+    {
+        this.kgshqx = kgshqx;
+    }
+
+    public String getKgshqx() 
+    {
+        return kgshqx;
+    }
+    public void setTclrqx(String tclrqx) 
+    {
+        this.tclrqx = tclrqx;
+    }
+
+    public String getTclrqx() 
+    {
+        return tclrqx;
+    }
+    public void setTcshqx(String tcshqx) 
+    {
+        this.tcshqx = tcshqx;
+    }
+
+    public String getTcshqx() 
+    {
+        return tcshqx;
+    }
+    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("xmmc", getXmmc())
+            .append("stshqx", getStshqx())
+            .append("ysbmshqx", getYsbmshqx())
+            .append("cjdcjqx", getCjdcjqx())
+            .append("qylrqx", getQylrqx())
+            .append("qyshqx", getQyshqx())
+            .append("kglrqx", getKglrqx())
+            .append("kgshqx", getKgshqx())
+            .append("tclrqx", getTclrqx())
+            .append("tcshqx", getTcshqx())
+            .append("type", getType())
+            .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/ZsyzLcjlMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzLcjl;
+
+/**
+ * 招商引资_流程记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public interface ZsyzLcjlMapper 
+{
+    /**
+     * 查询招商引资_流程记录
+     * 
+     * @param id 招商引资_流程记录主键
+     * @return 招商引资_流程记录
+     */
+    public ZsyzLcjl selectZsyzLcjlById(Long id);
+
+    /**
+     * 查询招商引资_流程记录列表
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 招商引资_流程记录集合
+     */
+    public List<ZsyzLcjl> selectZsyzLcjlList(ZsyzLcjl zsyzLcjl);
+
+    /**
+     * 新增招商引资_流程记录
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 结果
+     */
+    public int insertZsyzLcjl(ZsyzLcjl zsyzLcjl);
+
+    /**
+     * 修改招商引资_流程记录
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 结果
+     */
+    public int updateZsyzLcjl(ZsyzLcjl zsyzLcjl);
+
+    /**
+     * 删除招商引资_流程记录
+     * 
+     * @param id 招商引资_流程记录主键
+     * @return 结果
+     */
+    public int deleteZsyzLcjlById(Long id);
+
+    /**
+     * 批量删除招商引资_流程记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzLcjlByIds(Long[] ids);
+
+    List<ZsyzLcjl> selectZsyzLcjlListQc();
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxPz;
+
+/**
+ * 招商引资_审核期限_配置Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public interface ZsyzShqxPzMapper 
+{
+    /**
+     * 查询招商引资_审核期限_配置
+     * 
+     * @param id 招商引资_审核期限_配置主键
+     * @return 招商引资_审核期限_配置
+     */
+    public ZsyzShqxPz selectZsyzShqxPzById(Long id);
+
+    /**
+     * 查询招商引资_审核期限_配置列表
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 招商引资_审核期限_配置集合
+     */
+    public List<ZsyzShqxPz> selectZsyzShqxPzList(ZsyzShqxPz zsyzShqxPz);
+
+    /**
+     * 新增招商引资_审核期限_配置
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 结果
+     */
+    public int insertZsyzShqxPz(ZsyzShqxPz zsyzShqxPz);
+
+    /**
+     * 修改招商引资_审核期限_配置
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 结果
+     */
+    public int updateZsyzShqxPz(ZsyzShqxPz zsyzShqxPz);
+
+    /**
+     * 删除招商引资_审核期限_配置
+     * 
+     * @param id 招商引资_审核期限_配置主键
+     * @return 结果
+     */
+    public int deleteZsyzShqxPzById(Long id);
+
+    /**
+     * 批量删除招商引资_审核期限_配置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzShqxPzByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxXm;
+
+/**
+ * 招商引资_审核期限_项目Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public interface ZsyzShqxXmMapper 
+{
+    /**
+     * 查询招商引资_审核期限_项目
+     * 
+     * @param id 招商引资_审核期限_项目主键
+     * @return 招商引资_审核期限_项目
+     */
+    public ZsyzShqxXm selectZsyzShqxXmById(Long id);
+
+    /**
+     * 查询招商引资_审核期限_项目列表
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 招商引资_审核期限_项目集合
+     */
+    public List<ZsyzShqxXm> selectZsyzShqxXmList(ZsyzShqxXm zsyzShqxXm);
+
+    /**
+     * 新增招商引资_审核期限_项目
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 结果
+     */
+    public int insertZsyzShqxXm(ZsyzShqxXm zsyzShqxXm);
+
+    /**
+     * 修改招商引资_审核期限_项目
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 结果
+     */
+    public int updateZsyzShqxXm(ZsyzShqxXm zsyzShqxXm);
+
+    /**
+     * 删除招商引资_审核期限_项目
+     * 
+     * @param id 招商引资_审核期限_项目主键
+     * @return 结果
+     */
+    public int deleteZsyzShqxXmById(Long id);
+
+    /**
+     * 批量删除招商引资_审核期限_项目
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzShqxXmByIds(Long[] ids);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.projectV2.ZsyzLcjlMapper;
+import com.ruoyi.system.domain.projectV2.ZsyzLcjl;
+import com.ruoyi.system.service.projectV2.IZsyzLcjlService;
+
+/**
+ * 招商引资_流程记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+@Service
+public class ZsyzLcjlServiceImpl implements IZsyzLcjlService 
+{
+    @Autowired
+    private ZsyzLcjlMapper zsyzLcjlMapper;
+
+    /**
+     * 查询招商引资_流程记录
+     * 
+     * @param id 招商引资_流程记录主键
+     * @return 招商引资_流程记录
+     */
+    @Override
+    public ZsyzLcjl selectZsyzLcjlById(Long id)
+    {
+        return zsyzLcjlMapper.selectZsyzLcjlById(id);
+    }
+
+    /**
+     * 查询招商引资_流程记录列表
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 招商引资_流程记录
+     */
+    @Override
+    public List<ZsyzLcjl> selectZsyzLcjlList(ZsyzLcjl zsyzLcjl)
+    {
+        return zsyzLcjlMapper.selectZsyzLcjlList(zsyzLcjl);
+    }
+
+    /**
+     * 新增招商引资_流程记录
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzLcjl(ZsyzLcjl zsyzLcjl)
+    {
+        zsyzLcjl.setCreateTime(DateUtils.getNowDate());
+        return zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
+    }
+
+    /**
+     * 修改招商引资_流程记录
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzLcjl(ZsyzLcjl zsyzLcjl)
+    {
+        zsyzLcjl.setUpdateTime(DateUtils.getNowDate());
+        return zsyzLcjlMapper.updateZsyzLcjl(zsyzLcjl);
+    }
+
+    /**
+     * 批量删除招商引资_流程记录
+     * 
+     * @param ids 需要删除的招商引资_流程记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzLcjlByIds(Long[] ids)
+    {
+        return zsyzLcjlMapper.deleteZsyzLcjlByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_流程记录信息
+     * 
+     * @param id 招商引资_流程记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzLcjlById(Long id)
+    {
+        return zsyzLcjlMapper.deleteZsyzLcjlById(id);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.projectV2.ZsyzShqxPzMapper;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxPz;
+import com.ruoyi.system.service.projectV2.IZsyzShqxPzService;
+
+/**
+ * 招商引资_审核期限_配置Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+@Service
+public class ZsyzShqxPzServiceImpl implements IZsyzShqxPzService 
+{
+    @Autowired
+    private ZsyzShqxPzMapper zsyzShqxPzMapper;
+
+    /**
+     * 查询招商引资_审核期限_配置
+     * 
+     * @param id 招商引资_审核期限_配置主键
+     * @return 招商引资_审核期限_配置
+     */
+    @Override
+    public ZsyzShqxPz selectZsyzShqxPzById(Long id)
+    {
+        return zsyzShqxPzMapper.selectZsyzShqxPzById(id);
+    }
+
+    /**
+     * 查询招商引资_审核期限_配置列表
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 招商引资_审核期限_配置
+     */
+    @Override
+    public List<ZsyzShqxPz> selectZsyzShqxPzList(ZsyzShqxPz zsyzShqxPz)
+    {
+        return zsyzShqxPzMapper.selectZsyzShqxPzList(zsyzShqxPz);
+    }
+
+    /**
+     * 新增招商引资_审核期限_配置
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzShqxPz(ZsyzShqxPz zsyzShqxPz)
+    {
+        zsyzShqxPz.setCreateTime(DateUtils.getNowDate());
+        return zsyzShqxPzMapper.insertZsyzShqxPz(zsyzShqxPz);
+    }
+
+    /**
+     * 修改招商引资_审核期限_配置
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzShqxPz(ZsyzShqxPz zsyzShqxPz)
+    {
+        zsyzShqxPz.setUpdateTime(DateUtils.getNowDate());
+        return zsyzShqxPzMapper.updateZsyzShqxPz(zsyzShqxPz);
+    }
+
+    /**
+     * 批量删除招商引资_审核期限_配置
+     * 
+     * @param ids 需要删除的招商引资_审核期限_配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzShqxPzByIds(Long[] ids)
+    {
+        return zsyzShqxPzMapper.deleteZsyzShqxPzByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_审核期限_配置信息
+     * 
+     * @param id 招商引资_审核期限_配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzShqxPzById(Long id)
+    {
+        return zsyzShqxPzMapper.deleteZsyzShqxPzById(id);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.projectV2.ZsyzShqxXmMapper;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxXm;
+import com.ruoyi.system.service.projectV2.IZsyzShqxXmService;
+
+/**
+ * 招商引资_审核期限_项目Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+@Service
+public class ZsyzShqxXmServiceImpl implements IZsyzShqxXmService 
+{
+    @Autowired
+    private ZsyzShqxXmMapper zsyzShqxXmMapper;
+
+    /**
+     * 查询招商引资_审核期限_项目
+     * 
+     * @param id 招商引资_审核期限_项目主键
+     * @return 招商引资_审核期限_项目
+     */
+    @Override
+    public ZsyzShqxXm selectZsyzShqxXmById(Long id)
+    {
+        return zsyzShqxXmMapper.selectZsyzShqxXmById(id);
+    }
+
+    /**
+     * 查询招商引资_审核期限_项目列表
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 招商引资_审核期限_项目
+     */
+    @Override
+    public List<ZsyzShqxXm> selectZsyzShqxXmList(ZsyzShqxXm zsyzShqxXm)
+    {
+        return zsyzShqxXmMapper.selectZsyzShqxXmList(zsyzShqxXm);
+    }
+
+    /**
+     * 新增招商引资_审核期限_项目
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzShqxXm(ZsyzShqxXm zsyzShqxXm)
+    {
+        zsyzShqxXm.setCreateTime(DateUtils.getNowDate());
+        return zsyzShqxXmMapper.insertZsyzShqxXm(zsyzShqxXm);
+    }
+
+    /**
+     * 修改招商引资_审核期限_项目
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzShqxXm(ZsyzShqxXm zsyzShqxXm)
+    {
+        zsyzShqxXm.setUpdateTime(DateUtils.getNowDate());
+        return zsyzShqxXmMapper.updateZsyzShqxXm(zsyzShqxXm);
+    }
+
+    /**
+     * 批量删除招商引资_审核期限_项目
+     * 
+     * @param ids 需要删除的招商引资_审核期限_项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzShqxXmByIds(Long[] ids)
+    {
+        return zsyzShqxXmMapper.deleteZsyzShqxXmByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_审核期限_项目信息
+     * 
+     * @param id 招商引资_审核期限_项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzShqxXmById(Long id)
+    {
+        return zsyzShqxXmMapper.deleteZsyzShqxXmById(id);
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzLcjl;
+
+/**
+ * 招商引资_流程记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public interface IZsyzLcjlService 
+{
+    /**
+     * 查询招商引资_流程记录
+     * 
+     * @param id 招商引资_流程记录主键
+     * @return 招商引资_流程记录
+     */
+    public ZsyzLcjl selectZsyzLcjlById(Long id);
+
+    /**
+     * 查询招商引资_流程记录列表
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 招商引资_流程记录集合
+     */
+    public List<ZsyzLcjl> selectZsyzLcjlList(ZsyzLcjl zsyzLcjl);
+
+    /**
+     * 新增招商引资_流程记录
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 结果
+     */
+    public int insertZsyzLcjl(ZsyzLcjl zsyzLcjl);
+
+    /**
+     * 修改招商引资_流程记录
+     * 
+     * @param zsyzLcjl 招商引资_流程记录
+     * @return 结果
+     */
+    public int updateZsyzLcjl(ZsyzLcjl zsyzLcjl);
+
+    /**
+     * 批量删除招商引资_流程记录
+     * 
+     * @param ids 需要删除的招商引资_流程记录主键集合
+     * @return 结果
+     */
+    public int deleteZsyzLcjlByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_流程记录信息
+     * 
+     * @param id 招商引资_流程记录主键
+     * @return 结果
+     */
+    public int deleteZsyzLcjlById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxPz;
+
+/**
+ * 招商引资_审核期限_配置Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public interface IZsyzShqxPzService 
+{
+    /**
+     * 查询招商引资_审核期限_配置
+     * 
+     * @param id 招商引资_审核期限_配置主键
+     * @return 招商引资_审核期限_配置
+     */
+    public ZsyzShqxPz selectZsyzShqxPzById(Long id);
+
+    /**
+     * 查询招商引资_审核期限_配置列表
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 招商引资_审核期限_配置集合
+     */
+    public List<ZsyzShqxPz> selectZsyzShqxPzList(ZsyzShqxPz zsyzShqxPz);
+
+    /**
+     * 新增招商引资_审核期限_配置
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 结果
+     */
+    public int insertZsyzShqxPz(ZsyzShqxPz zsyzShqxPz);
+
+    /**
+     * 修改招商引资_审核期限_配置
+     * 
+     * @param zsyzShqxPz 招商引资_审核期限_配置
+     * @return 结果
+     */
+    public int updateZsyzShqxPz(ZsyzShqxPz zsyzShqxPz);
+
+    /**
+     * 批量删除招商引资_审核期限_配置
+     * 
+     * @param ids 需要删除的招商引资_审核期限_配置主键集合
+     * @return 结果
+     */
+    public int deleteZsyzShqxPzByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_审核期限_配置信息
+     * 
+     * @param id 招商引资_审核期限_配置主键
+     * @return 结果
+     */
+    public int deleteZsyzShqxPzById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzShqxXm;
+
+/**
+ * 招商引资_审核期限_项目Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-27
+ */
+public interface IZsyzShqxXmService 
+{
+    /**
+     * 查询招商引资_审核期限_项目
+     * 
+     * @param id 招商引资_审核期限_项目主键
+     * @return 招商引资_审核期限_项目
+     */
+    public ZsyzShqxXm selectZsyzShqxXmById(Long id);
+
+    /**
+     * 查询招商引资_审核期限_项目列表
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 招商引资_审核期限_项目集合
+     */
+    public List<ZsyzShqxXm> selectZsyzShqxXmList(ZsyzShqxXm zsyzShqxXm);
+
+    /**
+     * 新增招商引资_审核期限_项目
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 结果
+     */
+    public int insertZsyzShqxXm(ZsyzShqxXm zsyzShqxXm);
+
+    /**
+     * 修改招商引资_审核期限_项目
+     * 
+     * @param zsyzShqxXm 招商引资_审核期限_项目
+     * @return 结果
+     */
+    public int updateZsyzShqxXm(ZsyzShqxXm zsyzShqxXm);
+
+    /**
+     * 批量删除招商引资_审核期限_项目
+     * 
+     * @param ids 需要删除的招商引资_审核期限_项目主键集合
+     * @return 结果
+     */
+    public int deleteZsyzShqxXmByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_审核期限_项目信息
+     * 
+     * @param id 招商引资_审核期限_项目主键
+     * @return 结果
+     */
+    public int deleteZsyzShqxXmById(Long id);
+}

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

@@ -0,0 +1,113 @@
+<?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.ZsyzLcjlMapper">
+    
+    <resultMap type="ZsyzLcjl" id="ZsyzLcjlResult">
+        <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="clTime"    column="cl_time"    />
+        <result property="progress"    column="progress"    />
+        <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="selectZsyzLcjlVo">
+        select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress, create_by, create_time, update_by, update_time, remark from zsyz_lcjl
+    </sql>
+
+    <select id="selectZsyzLcjlList" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
+        <include refid="selectZsyzLcjlVo"/>
+        <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="clTime != null "> and cl_time = #{clTime}</if>
+            <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzLcjlById" parameterType="Long" resultMap="ZsyzLcjlResult">
+        <include refid="selectZsyzLcjlVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+        select ANY_VALUE(id) as id, ANY_VALUE(xm_id) as xm_id, ANY_VALUE(xmbh) as xmbh, ANY_VALUE(xmmc)as xmmc,
+               ANY_VALUE(dept_id) as dept_id, ANY_VALUE(dept_name) as dept_name, ANY_VALUE(cl_time) as cl_time, ANY_VALUE(progress) as progress
+        from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
+        from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
+    </select>
+
+    <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_lcjl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="xmmc != null and xmmc != ''">xmmc,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="clTime != null">cl_time,</if>
+            <if test="progress != null">progress,</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 and xmmc != ''">#{xmmc},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="clTime != null">#{clTime},</if>
+            <if test="progress != null">#{progress},</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="updateZsyzLcjl" parameterType="ZsyzLcjl">
+        update zsyz_lcjl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="clTime != null">cl_time = #{clTime},</if>
+            <if test="progress != null">progress = #{progress},</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="deleteZsyzLcjlById" parameterType="Long">
+        delete from zsyz_lcjl where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzLcjlByIds" parameterType="String">
+        delete from zsyz_lcjl 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

@@ -305,7 +305,7 @@
         where s.id = #{id} and s.is_del = 'N'
     </select>
 
-    <select id="selectZsyzSbbzbListDc" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
+    <select id="selectZsyzSbbzbListDc" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
         select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
         s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
         s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
@@ -313,9 +313,9 @@
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,
-        q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq, q.xytze, q.swzj, q.gdzctze, q.qygjrsjh,
+        q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze, q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
         q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
-        q.ydmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq, q.path, q.create_by, q.create_time,
+        q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by, q.create_time,
         q.update_by, q.update_time, q.remark,
         k.id, k.xm_id, k.xmbh, k.xmmc, k.kgrq, k.njgrq, k.sscrq, k.ntcsj, k.rtsj, k.nrtsj, k.kggjrsjh, k.create_by,
         k.create_time, k.update_by,

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

@@ -0,0 +1,121 @@
+<?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.ZsyzShqxPzMapper">
+    
+    <resultMap type="ZsyzShqxPz" id="ZsyzShqxPzResult">
+        <result property="id"    column="id"    />
+        <result property="stshqx"    column="stshqx"    />
+        <result property="ysbmshqx"    column="ysbmshqx"    />
+        <result property="cjdcjqx"    column="cjdcjqx"    />
+        <result property="qylrqx"    column="qylrqx"    />
+        <result property="qyshqx"    column="qyshqx"    />
+        <result property="kglrqx"    column="kglrqx"    />
+        <result property="kgshqx"    column="kgshqx"    />
+        <result property="tclrqx"    column="tclrqx"    />
+        <result property="tcshqx"    column="tcshqx"    />
+        <result property="type"    column="type"    />
+        <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="selectZsyzShqxPzVo">
+        select id, stshqx, ysbmshqx, cjdcjqx, qylrqx, qyshqx, kglrqx, kgshqx, tclrqx, tcshqx, type, create_by, create_time, update_by, update_time, remark from zsyz_shqx_pz
+    </sql>
+
+    <select id="selectZsyzShqxPzList" parameterType="ZsyzShqxPz" resultMap="ZsyzShqxPzResult">
+        <include refid="selectZsyzShqxPzVo"/>
+        <where>  
+            <if test="stshqx != null  and stshqx != ''"> and stshqx = #{stshqx}</if>
+            <if test="ysbmshqx != null  and ysbmshqx != ''"> and ysbmshqx = #{ysbmshqx}</if>
+            <if test="cjdcjqx != null  and cjdcjqx != ''"> and cjdcjqx = #{cjdcjqx}</if>
+            <if test="qylrqx != null  and qylrqx != ''"> and qylrqx = #{qylrqx}</if>
+            <if test="qyshqx != null  and qyshqx != ''"> and qyshqx = #{qyshqx}</if>
+            <if test="kglrqx != null  and kglrqx != ''"> and kglrqx = #{kglrqx}</if>
+            <if test="kgshqx != null  and kgshqx != ''"> and kgshqx = #{kgshqx}</if>
+            <if test="tclrqx != null  and tclrqx != ''"> and tclrqx = #{tclrqx}</if>
+            <if test="tcshqx != null  and tcshqx != ''"> and tcshqx = #{tcshqx}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzShqxPzById" parameterType="Long" resultMap="ZsyzShqxPzResult">
+        <include refid="selectZsyzShqxPzVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzShqxPz" parameterType="ZsyzShqxPz" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_shqx_pz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stshqx != null and stshqx != ''">stshqx,</if>
+            <if test="ysbmshqx != null and ysbmshqx != ''">ysbmshqx,</if>
+            <if test="cjdcjqx != null and cjdcjqx != ''">cjdcjqx,</if>
+            <if test="qylrqx != null and qylrqx != ''">qylrqx,</if>
+            <if test="qyshqx != null and qyshqx != ''">qyshqx,</if>
+            <if test="kglrqx != null and kglrqx != ''">kglrqx,</if>
+            <if test="kgshqx != null and kgshqx != ''">kgshqx,</if>
+            <if test="tclrqx != null and tclrqx != ''">tclrqx,</if>
+            <if test="tcshqx != null and tcshqx != ''">tcshqx,</if>
+            <if test="type != null and type != ''">type,</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="stshqx != null and stshqx != ''">#{stshqx},</if>
+            <if test="ysbmshqx != null and ysbmshqx != ''">#{ysbmshqx},</if>
+            <if test="cjdcjqx != null and cjdcjqx != ''">#{cjdcjqx},</if>
+            <if test="qylrqx != null and qylrqx != ''">#{qylrqx},</if>
+            <if test="qyshqx != null and qyshqx != ''">#{qyshqx},</if>
+            <if test="kglrqx != null and kglrqx != ''">#{kglrqx},</if>
+            <if test="kgshqx != null and kgshqx != ''">#{kgshqx},</if>
+            <if test="tclrqx != null and tclrqx != ''">#{tclrqx},</if>
+            <if test="tcshqx != null and tcshqx != ''">#{tcshqx},</if>
+            <if test="type != null and type != ''">#{type},</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="updateZsyzShqxPz" parameterType="ZsyzShqxPz">
+        update zsyz_shqx_pz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stshqx != null and stshqx != ''">stshqx = #{stshqx},</if>
+            <if test="ysbmshqx != null and ysbmshqx != ''">ysbmshqx = #{ysbmshqx},</if>
+            <if test="cjdcjqx != null and cjdcjqx != ''">cjdcjqx = #{cjdcjqx},</if>
+            <if test="qylrqx != null and qylrqx != ''">qylrqx = #{qylrqx},</if>
+            <if test="qyshqx != null and qyshqx != ''">qyshqx = #{qyshqx},</if>
+            <if test="kglrqx != null and kglrqx != ''">kglrqx = #{kglrqx},</if>
+            <if test="kgshqx != null and kgshqx != ''">kgshqx = #{kgshqx},</if>
+            <if test="tclrqx != null and tclrqx != ''">tclrqx = #{tclrqx},</if>
+            <if test="tcshqx != null and tcshqx != ''">tcshqx = #{tcshqx},</if>
+            <if test="type != null and type != ''">type = #{type},</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="deleteZsyzShqxPzById" parameterType="Long">
+        delete from zsyz_shqx_pz where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzShqxPzByIds" parameterType="String">
+        delete from zsyz_shqx_pz where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,136 @@
+<?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.ZsyzShqxXmMapper">
+    
+    <resultMap type="ZsyzShqxXm" id="ZsyzShqxXmResult">
+        <result property="id"    column="id"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="stshqx"    column="stshqx"    />
+        <result property="ysbmshqx"    column="ysbmshqx"    />
+        <result property="cjdcjqx"    column="cjdcjqx"    />
+        <result property="qylrqx"    column="qylrqx"    />
+        <result property="qyshqx"    column="qyshqx"    />
+        <result property="kglrqx"    column="kglrqx"    />
+        <result property="kgshqx"    column="kgshqx"    />
+        <result property="tclrqx"    column="tclrqx"    />
+        <result property="tcshqx"    column="tcshqx"    />
+        <result property="type"    column="type"    />
+        <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="selectZsyzShqxXmVo">
+        select id, xm_id, xmbh, xmmc, stshqx, ysbmshqx, cjdcjqx, qylrqx, qyshqx, kglrqx, kgshqx, tclrqx, tcshqx, type, create_by, create_time, update_by, update_time, remark from zsyz_shqx_xm
+    </sql>
+
+    <select id="selectZsyzShqxXmList" parameterType="ZsyzShqxXm" resultMap="ZsyzShqxXmResult">
+        <include refid="selectZsyzShqxXmVo"/>
+        <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="stshqx != null  and stshqx != ''"> and stshqx = #{stshqx}</if>
+            <if test="ysbmshqx != null  and ysbmshqx != ''"> and ysbmshqx = #{ysbmshqx}</if>
+            <if test="cjdcjqx != null  and cjdcjqx != ''"> and cjdcjqx = #{cjdcjqx}</if>
+            <if test="qylrqx != null  and qylrqx != ''"> and qylrqx = #{qylrqx}</if>
+            <if test="qyshqx != null  and qyshqx != ''"> and qyshqx = #{qyshqx}</if>
+            <if test="kglrqx != null  and kglrqx != ''"> and kglrqx = #{kglrqx}</if>
+            <if test="kgshqx != null  and kgshqx != ''"> and kgshqx = #{kgshqx}</if>
+            <if test="tclrqx != null  and tclrqx != ''"> and tclrqx = #{tclrqx}</if>
+            <if test="tcshqx != null  and tcshqx != ''"> and tcshqx = #{tcshqx}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzShqxXmById" parameterType="Long" resultMap="ZsyzShqxXmResult">
+        <include refid="selectZsyzShqxXmVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzShqxXm" parameterType="ZsyzShqxXm" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_shqx_xm
+        <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="stshqx != null and stshqx != ''">stshqx,</if>
+            <if test="ysbmshqx != null and ysbmshqx != ''">ysbmshqx,</if>
+            <if test="cjdcjqx != null and cjdcjqx != ''">cjdcjqx,</if>
+            <if test="qylrqx != null and qylrqx != ''">qylrqx,</if>
+            <if test="qyshqx != null and qyshqx != ''">qyshqx,</if>
+            <if test="kglrqx != null and kglrqx != ''">kglrqx,</if>
+            <if test="kgshqx != null and kgshqx != ''">kgshqx,</if>
+            <if test="tclrqx != null and tclrqx != ''">tclrqx,</if>
+            <if test="tcshqx != null and tcshqx != ''">tcshqx,</if>
+            <if test="type != null and type != ''">type,</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="stshqx != null and stshqx != ''">#{stshqx},</if>
+            <if test="ysbmshqx != null and ysbmshqx != ''">#{ysbmshqx},</if>
+            <if test="cjdcjqx != null and cjdcjqx != ''">#{cjdcjqx},</if>
+            <if test="qylrqx != null and qylrqx != ''">#{qylrqx},</if>
+            <if test="qyshqx != null and qyshqx != ''">#{qyshqx},</if>
+            <if test="kglrqx != null and kglrqx != ''">#{kglrqx},</if>
+            <if test="kgshqx != null and kgshqx != ''">#{kgshqx},</if>
+            <if test="tclrqx != null and tclrqx != ''">#{tclrqx},</if>
+            <if test="tcshqx != null and tcshqx != ''">#{tcshqx},</if>
+            <if test="type != null and type != ''">#{type},</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="updateZsyzShqxXm" parameterType="ZsyzShqxXm">
+        update zsyz_shqx_xm
+        <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="stshqx != null and stshqx != ''">stshqx = #{stshqx},</if>
+            <if test="ysbmshqx != null and ysbmshqx != ''">ysbmshqx = #{ysbmshqx},</if>
+            <if test="cjdcjqx != null and cjdcjqx != ''">cjdcjqx = #{cjdcjqx},</if>
+            <if test="qylrqx != null and qylrqx != ''">qylrqx = #{qylrqx},</if>
+            <if test="qyshqx != null and qyshqx != ''">qyshqx = #{qyshqx},</if>
+            <if test="kglrqx != null and kglrqx != ''">kglrqx = #{kglrqx},</if>
+            <if test="kgshqx != null and kgshqx != ''">kgshqx = #{kgshqx},</if>
+            <if test="tclrqx != null and tclrqx != ''">tclrqx = #{tclrqx},</if>
+            <if test="tcshqx != null and tcshqx != ''">tcshqx = #{tcshqx},</if>
+            <if test="type != null and type != ''">type = #{type},</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="deleteZsyzShqxXmById" parameterType="Long">
+        delete from zsyz_shqx_xm where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzShqxXmByIds" parameterType="String">
+        delete from zsyz_shqx_xm where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>