新增 V2版本首页统计/督办/进展说明

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

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.ZsyzDbd;
+import com.ruoyi.system.service.projectV2.IZsyzDbdService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_督办单Controller
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+@RestController
+@RequestMapping("/projectV2/dbd")
+public class ZsyzDbdController extends BaseController
+{
+    @Autowired
+    private IZsyzDbdService zsyzDbdService;
+
+    /**
+     * 查询招商引资_督办单列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dbd:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzDbd zsyzDbd)
+    {
+        startPage();
+        List<ZsyzDbd> list = zsyzDbdService.selectZsyzDbdList(zsyzDbd);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_督办单列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dbd:export')")
+    @Log(title = "招商引资_督办单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzDbd zsyzDbd)
+    {
+        List<ZsyzDbd> list = zsyzDbdService.selectZsyzDbdList(zsyzDbd);
+        ExcelUtil<ZsyzDbd> util = new ExcelUtil<ZsyzDbd>(ZsyzDbd.class);
+        util.exportExcel(response, list, "招商引资_督办单数据");
+    }
+
+    /**
+     * 获取招商引资_督办单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dbd:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzDbdService.selectZsyzDbdById(id));
+    }
+
+    /**
+     * 新增招商引资_督办单
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dbd:add')")
+    @Log(title = "招商引资_督办单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzDbd zsyzDbd)
+    {
+        return toAjax(zsyzDbdService.insertZsyzDbd(zsyzDbd));
+    }
+
+    /**
+     * 修改招商引资_督办单
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dbd:edit')")
+    @Log(title = "招商引资_督办单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZsyzDbd zsyzDbd)
+    {
+        return toAjax(zsyzDbdService.updateZsyzDbd(zsyzDbd));
+    }
+
+    /**
+     * 删除招商引资_督办单
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:dbd:remove')")
+    @Log(title = "招商引资_督办单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzDbdService.deleteZsyzDbdByIds(ids));
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.projectV2.ZsyzJzqk;
+import com.ruoyi.system.service.projectV2.IZsyzJzqkService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)Controller
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+@RestController
+@RequestMapping("/projectV2/jzqk")
+public class ZsyzJzqkController extends BaseController
+{
+    @Autowired
+    private IZsyzJzqkService zsyzJzqkService;
+
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:jzqk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzJzqk zsyzJzqk)
+    {
+        startPage();
+        List<ZsyzJzqk> list = zsyzJzqkService.selectZsyzJzqkList(zsyzJzqk);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:jzqk:export')")
+    @Log(title = "招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzJzqk zsyzJzqk)
+    {
+        List<ZsyzJzqk> list = zsyzJzqkService.selectZsyzJzqkList(zsyzJzqk);
+        ExcelUtil<ZsyzJzqk> util = new ExcelUtil<ZsyzJzqk>(ZsyzJzqk.class);
+        util.exportExcel(response, list, "招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)数据");
+    }
+
+    /**
+     * 获取招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:jzqk:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzJzqkService.selectZsyzJzqkById(id));
+    }
+
+    /**
+     * 新增招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:jzqk:add')")
+    @Log(title = "招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzJzqk zsyzJzqk)
+    {
+        return toAjax(zsyzJzqkService.insertZsyzJzqk(zsyzJzqk));
+    }
+
+    /**
+     * 修改招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:jzqk:edit')")
+    @Log(title = "招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZsyzJzqk zsyzJzqk)
+    {
+        return toAjax(zsyzJzqkService.updateZsyzJzqk(zsyzJzqk));
+    }
+
+    /**
+     * 删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:jzqk:remove')")
+    @Log(title = "招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzJzqkService.deleteZsyzJzqkByIds(ids));
+    }
+}

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.projectV2.ZsyzFj;
@@ -49,6 +50,17 @@ public class ZsyzCommonController extends BaseController {
 
     @Autowired
     private IZsyzCommonService zsyzCommonService;
+
+    /**
+     * 首页统计
+     * @return
+     */
+    @GetMapping("/census")
+    public AjaxResult census() {
+        return  zsyzCommonService.census();
+    }
+
+
     /**
      * 生成项目编号接口
      * @return
@@ -93,7 +105,7 @@ public class ZsyzCommonController extends BaseController {
                     zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
                 }
             }
-        }else {
+        }else if (TWO.equals(zpType)){
             //判断该项目是否已经被指派
             ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbService.selectZsyzSbbzbById(zsyzSbbzb.getId());
             if (zsyzSbbzbOld != null){
@@ -104,6 +116,29 @@ public class ZsyzCommonController extends BaseController {
             }
             //指派给承接地
             zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
+        }else if (THR.equals(zpType)){
+            //两个都发先去发承接地,承接地发送成功再去发要素部门
+            //判断该项目是否已经被指派
+            ZsyzSbbzb zsyzSbbzbOld = zsyzSbbzbService.selectZsyzSbbzbById(zsyzSbbzb.getId());
+            if (zsyzSbbzbOld != null){
+                Long cjdId = zsyzSbbzbOld.getCjdId();
+                if (cjdId != null){
+                    return AjaxResult.error("该线索已被指派,请勿重复指派或等待当前指派承接地放弃承接");
+                }
+            }
+            ArrayList<SysDept> deptList = zsyzSbbzb.getDeptList();
+            if (deptList != null && deptList.size() > 0){
+                for (SysDept sysDept : deptList) {
+                    ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
+                    zsyzProjectDept.setXmId(zsyzSbbzb.getId());
+                    zsyzProjectDept.setXmbh(zsyzSbbzb.getXmbh());
+                    zsyzProjectDept.setXmmc(zsyzSbbzb.getXmxsmc());
+                    zsyzProjectDept.setDeptId(sysDept.getDeptId());
+                    zsyzProjectDept.setDeptName(sysDept.getDeptName());
+                    //指派给要素部门
+                    zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
+                }
+            }
         }
         return AjaxResult.success();
     }

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

@@ -30,4 +30,18 @@ public class CommonConstants {
     public static final String  XMJD_QY= "签约阶段";
     public static final String  XMJD_KG= "开工阶段";
     public static final String  XMJD_TC= "投产阶段";
+
+    //角色权限
+    //平台管理员
+    public static final String  MANAGE= "manage";
+    //承接地
+    public static final String  CJD= "cjd";
+    //市直部门
+    public static final String  SZBM= "szbm";
+    //缓存首页统计数据
+    public static final String  INDEX= "index";
+
+
+
+
 }

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

@@ -0,0 +1,284 @@
+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_dbd
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+public class ZsyzDbd extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 督办单号(自动生成) */
+    @Excel(name = "督办单号(自动生成)")
+    private String dh;
+
+    /** 项目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;
+
+    /** 是否回复 N:未回复，2:已回复 */
+    @Excel(name = "是否回复 N:未回复，2:已回复")
+    private String isHf;
+
+    /** 督办日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "督办日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dbTime;
+
+    /** 办理时限 */
+    @Excel(name = "办理时限")
+    private String blsx;
+
+    /** 督办事项 */
+    @Excel(name = "督办事项")
+    private String dbsx;
+
+    /** 进展情况 */
+    @Excel(name = "进展情况")
+    private String jzqk;
+
+    /** 存在问题 */
+    @Excel(name = "存在问题")
+    private String czwt;
+
+    /** 解决建议 */
+    @Excel(name = "解决建议")
+    private String jjjy;
+
+    /** 下一步工作计划 */
+    @Excel(name = "下一步工作计划")
+    private String gzjh;
+
+    /** 填报人 */
+    @Excel(name = "填报人")
+    private String tbr;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 填报日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "c", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date tbTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDh(String dh) 
+    {
+        this.dh = dh;
+    }
+
+    public String getDh() 
+    {
+        return dh;
+    }
+    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 setIsHf(String isHf) 
+    {
+        this.isHf = isHf;
+    }
+
+    public String getIsHf() 
+    {
+        return isHf;
+    }
+    public void setDbTime(Date dbTime) 
+    {
+        this.dbTime = dbTime;
+    }
+
+    public Date getDbTime() 
+    {
+        return dbTime;
+    }
+    public void setBlsx(String blsx) 
+    {
+        this.blsx = blsx;
+    }
+
+    public String getBlsx() 
+    {
+        return blsx;
+    }
+    public void setDbsx(String dbsx) 
+    {
+        this.dbsx = dbsx;
+    }
+
+    public String getDbsx() 
+    {
+        return dbsx;
+    }
+    public void setJzqk(String jzqk) 
+    {
+        this.jzqk = jzqk;
+    }
+
+    public String getJzqk() 
+    {
+        return jzqk;
+    }
+    public void setCzwt(String czwt) 
+    {
+        this.czwt = czwt;
+    }
+
+    public String getCzwt() 
+    {
+        return czwt;
+    }
+    public void setJjjy(String jjjy) 
+    {
+        this.jjjy = jjjy;
+    }
+
+    public String getJjjy() 
+    {
+        return jjjy;
+    }
+    public void setGzjh(String gzjh) 
+    {
+        this.gzjh = gzjh;
+    }
+
+    public String getGzjh() 
+    {
+        return gzjh;
+    }
+    public void setTbr(String tbr) 
+    {
+        this.tbr = tbr;
+    }
+
+    public String getTbr() 
+    {
+        return tbr;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setTbTime(Date tbTime) 
+    {
+        this.tbTime = tbTime;
+    }
+
+    public Date getTbTime() 
+    {
+        return tbTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dh", getDh())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("xmmc", getXmmc())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("isHf", getIsHf())
+            .append("dbTime", getDbTime())
+            .append("blsx", getBlsx())
+            .append("dbsx", getDbsx())
+            .append("jzqk", getJzqk())
+            .append("czwt", getCzwt())
+            .append("jjjy", getJjjy())
+            .append("gzjh", getGzjh())
+            .append("tbr", getTbr())
+            .append("phone", getPhone())
+            .append("tbTime", getTbTime())
+            .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/ZsyzJzqk.java

@@ -0,0 +1,269 @@
+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_jzqk
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+public class ZsyzJzqk 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;
+
+    /** 洽谈人 */
+    @Excel(name = "洽谈人")
+    private String qtrName;
+
+    /** 洽谈日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "洽谈日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date qtTime;
+
+    /** 洽谈人性质 */
+    @Excel(name = "洽谈人性质")
+    private String qtrxz;
+
+    /** 洽谈人单位职务 */
+    @Excel(name = "洽谈人单位职务")
+    private String qtrdwzw;
+
+    /** 洽谈人电话 */
+    @Excel(name = "洽谈人电话")
+    private String phone;
+
+    /** 进展说明时限 */
+    @Excel(name = "进展说明时限")
+    private String blsx;
+
+    /** 督办事项 */
+    @Excel(name = "督办事项")
+    private String dbsx;
+
+    /** 进展情况 */
+    @Excel(name = "进展情况")
+    private String jzqk;
+
+    /** 存在问题 */
+    @Excel(name = "存在问题")
+    private String czwt;
+
+    /** 解决建议 */
+    @Excel(name = "解决建议")
+    private String jjjy;
+
+    /** 下一步工作计划 */
+    @Excel(name = "下一步工作计划")
+    private String gzjh;
+
+    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 setQtrName(String qtrName) 
+    {
+        this.qtrName = qtrName;
+    }
+
+    public String getQtrName() 
+    {
+        return qtrName;
+    }
+    public void setQtTime(Date qtTime) 
+    {
+        this.qtTime = qtTime;
+    }
+
+    public Date getQtTime() 
+    {
+        return qtTime;
+    }
+    public void setQtrxz(String qtrxz) 
+    {
+        this.qtrxz = qtrxz;
+    }
+
+    public String getQtrxz() 
+    {
+        return qtrxz;
+    }
+    public void setQtrdwzw(String qtrdwzw) 
+    {
+        this.qtrdwzw = qtrdwzw;
+    }
+
+    public String getQtrdwzw() 
+    {
+        return qtrdwzw;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setBlsx(String blsx) 
+    {
+        this.blsx = blsx;
+    }
+
+    public String getBlsx() 
+    {
+        return blsx;
+    }
+    public void setDbsx(String dbsx) 
+    {
+        this.dbsx = dbsx;
+    }
+
+    public String getDbsx() 
+    {
+        return dbsx;
+    }
+    public void setJzqk(String jzqk) 
+    {
+        this.jzqk = jzqk;
+    }
+
+    public String getJzqk() 
+    {
+        return jzqk;
+    }
+    public void setCzwt(String czwt) 
+    {
+        this.czwt = czwt;
+    }
+
+    public String getCzwt() 
+    {
+        return czwt;
+    }
+    public void setJjjy(String jjjy) 
+    {
+        this.jjjy = jjjy;
+    }
+
+    public String getJjjy() 
+    {
+        return jjjy;
+    }
+    public void setGzjh(String gzjh) 
+    {
+        this.gzjh = gzjh;
+    }
+
+    public String getGzjh() 
+    {
+        return gzjh;
+    }
+
+    @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("qtrName", getQtrName())
+            .append("qtTime", getQtTime())
+            .append("qtrxz", getQtrxz())
+            .append("qtrdwzw", getQtrdwzw())
+            .append("phone", getPhone())
+            .append("blsx", getBlsx())
+            .append("dbsx", getDbsx())
+            .append("jzqk", getJzqk())
+            .append("czwt", getCzwt())
+            .append("jjjy", getJjjy())
+            .append("gzjh", getGzjh())
+            .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/ZsyzQyxx.java

@@ -52,16 +52,19 @@ public class ZsyzQyxx extends BaseEntity
     @Excel(name = "签约日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date qyrq;
 
+    /** 协议投资额来源 */
+    @Excel(name = "协议投资额来源")
+    private String xytzely;
     /** 协议投资额（万元） */
-    @Excel(name = "协议投资额", readConverterExp = "万=元")
+    @Excel(name = "协议投资额")
     private String xytze;
 
     /** 市外资金（万元） */
-    @Excel(name = "市外资金", readConverterExp = "万=元")
+    @Excel(name = "市外资金")
     private String swzj;
 
     /** 固定资产投资额（万元） */
-    @Excel(name = "固定资产投资额", readConverterExp = "万=元")
+    @Excel(name = "固定资产投资额")
     private String gdzctze;
 
     /** 项目跟进人姓名 */
@@ -83,15 +86,15 @@ public class ZsyzQyxx extends BaseEntity
     private String sshy;
 
     /** 投资方式（1：独资，2：合资，3：合作，4：收购，5：参股，6：兼并，7：其他） */
-    @Excel(name = "投资方式", readConverterExp = "1=：独资，2：合资，3：合作，4：收购，5：参股，6：兼并，7：其他")
+    @Excel(name = "投资方式")
     private String tzfs;
 
     /** 建设方式（1：新建，2：改建，3：扩建，4：租赁） */
-    @Excel(name = "建设方式", readConverterExp = "1=：新建，2：改建，3：扩建，4：租赁")
+    @Excel(name = "建设方式")
     private String jsfs;
 
     /** 是否宜商（1：是，2：否） */
-    @Excel(name = "是否宜商", readConverterExp = "1=：是，2：否")
+    @Excel(name = "是否宜商", readConverterExp = "1=是,2否")
     private String sfys;
 
     /** 建设内容 */
@@ -99,7 +102,7 @@ public class ZsyzQyxx extends BaseEntity
     private String jsnr;
 
     /** 租赁厂房(平方米) */
-    @Excel(name = "租赁厂房(平方米)", readConverterExp = "亩=")
+    @Excel(name = "租赁厂房(平方米)")
     private String zlcf;
 
     /**
@@ -118,7 +121,7 @@ public class ZsyzQyxx extends BaseEntity
     private Date zcrq;
 
     /** 注册资本（万元） */
-    @Excel(name = "注册资本", readConverterExp = "万=元")
+    @Excel(name = "注册资本")
     private String zczb;
 
     /** 法人代表 */
@@ -150,6 +153,14 @@ public class ZsyzQyxx extends BaseEntity
     /** 附件集合 */
     private List<ZsyzFj> zsyzFjList;
 
+    public String getXytzely() {
+        return xytzely;
+    }
+
+    public void setXytzely(String xytzely) {
+        this.xytzely = xytzely;
+    }
+
     public String getXmgjrxm() {
         return xmgjrxm;
     }
@@ -446,6 +457,7 @@ public class ZsyzQyxx extends BaseEntity
                 ", wfqyr='" + wfqyr + '\'' +
                 ", tbrq=" + tbrq +
                 ", qyrq=" + qyrq +
+                ", xytzely='" + xytzely + '\'' +
                 ", xytze='" + xytze + '\'' +
                 ", swzj='" + swzj + '\'' +
                 ", gdzctze='" + gdzctze + '\'' +

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

@@ -197,6 +197,11 @@ public class ZsyzSbbzb extends BaseEntity
      */
     private String zpType;
 
+    /**
+     * 审核意见列表
+     */
+    private List<ZsyzShyj> shyjList;
+
 
     /** 签约信息对象 */
     @Excels({
@@ -207,11 +212,16 @@ public class ZsyzSbbzb extends BaseEntity
             @Excel(name = "签约日期",targetAttr = "qyrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "协议投资额（万元）", targetAttr = "xytze"),
             @Excel(name = "市外资金（万元）", targetAttr = "swzj"),
+            @Excel(name = "固定资产投资额（万元）", targetAttr = "gdzctze"),
+            @Excel(name = "项目跟进人姓名", targetAttr = "xmgjrxm"),
+            @Excel(name = "项目跟进人职务", targetAttr = "xmgjrzw"),
+            @Excel(name = "项目跟进人手机号", targetAttr = "xmgjrsjh"),
             @Excel(name = "项目所在地", targetAttr = "xmszd"),
             @Excel(name = "所属行业", targetAttr = "sshy", readConverterExp = "1=智能 (汽车) 制造,2=装备制造,3=轻工制造,4=新材料,5=新能源,6=生物医药,7=石油化工,8=电子元器件 (信息),9=汽车零部件,10=纺织服装,11=农产品深加工,12=食品加工,13=大数据,14=大健康,15=文化旅游,16=现代服务业,17=三产融台,18=其他 "),
             @Excel(name = "投资方式", targetAttr = "tzfs", readConverterExp = "1=独资,2=合资,3=合作,4=收购,5=参股,6=兼并,7=其他"),
             @Excel(name = "建设方式", targetAttr = "jsfs", readConverterExp = "1=新建,2=改建,3=扩建,4=租赁"),
-            @Excel(name = "用地面积（亩）", targetAttr = "ydmj"),
+            @Excel(name = "租赁厂房(平方米)", targetAttr = "zlcf"),
+            @Excel(name = "供地面积(亩)", targetAttr = "gdmj"),
             @Excel(name = "备注", targetAttr = "remark"),
             @Excel(name = "注册日期", targetAttr = "zcrq", width = 30, dateFormat = "yyyy-MM-dd"),
             @Excel(name = "注册资本（万元）", targetAttr = "zczb"),
@@ -260,6 +270,13 @@ public class ZsyzSbbzb extends BaseEntity
     private ZsyzTcxx zsyzTcxx;*/
 
 
+    public List<ZsyzShyj> getShyjList() {
+        return shyjList;
+    }
+
+    public void setShyjList(List<ZsyzShyj> shyjList) {
+        this.shyjList = shyjList;
+    }
 
     public String getZpType() {
         return zpType;
@@ -730,6 +747,7 @@ public class ZsyzSbbzb extends BaseEntity
             .append("cjdName", getCjdName())
             .append("isMeet", getIsMeet())
             .append("meetRemark", getMeetRemark())
+            .append("shyjList", getShyjList())
             .toString();
     }
 }

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

@@ -57,7 +57,7 @@ public class ZsyzShyj extends BaseEntity
     /** 审核时间 */
     @Excel(name = "审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Data shsj;
+    private String shsj;
 
     public String getXmmc() {
         return xmmc;
@@ -140,32 +140,27 @@ public class ZsyzShyj extends BaseEntity
         return shyj;
     }
 
-    public Data getShsj() {
+    public String getShsj() {
         return shsj;
     }
 
-    public void setShsj(Data shsj) {
+    public void setShsj(String shsj) {
         this.shsj = shsj;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("xmId", getXmId())
-            .append("xmbh", getXmbh())
-            .append("deptId", getDeptId())
-            .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())
-            .append("xmmc", getXmmc())
-            .toString();
+        return "ZsyzShyj{" +
+                "id=" + id +
+                ", xmId=" + xmId +
+                ", xmbh='" + xmbh + '\'' +
+                ", xmmc='" + xmmc + '\'' +
+                ", deptId=" + deptId +
+                ", shrxm='" + shrxm + '\'' +
+                ", xmjd='" + xmjd + '\'' +
+                ", shjg='" + shjg + '\'' +
+                ", shyj='" + shyj + '\'' +
+                ", shsj=" + shsj +
+                '}';
     }
 }

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

@@ -90,8 +90,18 @@ public class ZsyzSkxm extends BaseEntity
     /** 审核建议 */
     @Excel(name = "审核建议")
     private String shJy;
+    //部门id
+    private Long deptId;
 
-    public void setId(Long id) 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -275,6 +285,7 @@ public class ZsyzSkxm extends BaseEntity
             .append("shName", getShName())
             .append("shTime", getShTime())
             .append("shJy", getShJy())
+            .append("deptId", getDeptId())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzDbd;
+
+import java.util.List;
+
+
+/**
+ * 招商引资_督办单Mapper接口
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+public interface ZsyzDbdMapper 
+{
+    /**
+     * 查询招商引资_督办单
+     * 
+     * @param id 招商引资_督办单主键
+     * @return 招商引资_督办单
+     */
+    public ZsyzDbd selectZsyzDbdById(Long id);
+
+    /**
+     * 查询招商引资_督办单列表
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 招商引资_督办单集合
+     */
+    public List<ZsyzDbd> selectZsyzDbdList(ZsyzDbd zsyzDbd);
+
+    /**
+     * 新增招商引资_督办单
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 结果
+     */
+    public int insertZsyzDbd(ZsyzDbd zsyzDbd);
+
+    /**
+     * 修改招商引资_督办单
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 结果
+     */
+    public int updateZsyzDbd(ZsyzDbd zsyzDbd);
+
+    /**
+     * 删除招商引资_督办单
+     * 
+     * @param id 招商引资_督办单主键
+     * @return 结果
+     */
+    public int deleteZsyzDbdById(Long id);
+
+    /**
+     * 批量删除招商引资_督办单
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzDbdByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzJzqk;
+
+import java.util.List;
+
+/**
+ * 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)Mapper接口
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+public interface ZsyzJzqkMapper 
+{
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param id 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    public ZsyzJzqk selectZsyzJzqkById(Long id);
+
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)列表
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)集合
+     */
+    public List<ZsyzJzqk> selectZsyzJzqkList(ZsyzJzqk zsyzJzqk);
+
+    /**
+     * 新增招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 结果
+     */
+    public int insertZsyzJzqk(ZsyzJzqk zsyzJzqk);
+
+    /**
+     * 修改招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 结果
+     */
+    public int updateZsyzJzqk(ZsyzJzqk zsyzJzqk);
+
+    /**
+     * 删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param id 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 结果
+     */
+    public int deleteZsyzJzqkById(Long id);
+
+    /**
+     * 批量删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzJzqkByIds(Long[] ids);
+}

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

@@ -28,6 +28,13 @@ public interface ZsyzSbbzbMapper
      */
     public List<ZsyzSbbzb> selectZsyzSbbzbList(ZsyzSbbzb zsyzSbbzb);
 
+    /**
+     * 查询指派给市值部门的或者承接地是市值部门的申报数据
+     * @param zsyzSbbzb
+     * @return
+     */
+    public List<ZsyzSbbzb> selectZsyzSbbzbListByZp(ZsyzSbbzb zsyzSbbzb);
+
     /**
      * 新增招商引资_申报_首谈信息_主
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/ZsyzDbdServiceImpl.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.ZsyzDbd;
+import com.ruoyi.system.mapper.projectV2.ZsyzDbdMapper;
+import com.ruoyi.system.service.projectV2.IZsyzDbdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 招商引资_督办单Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+@Service
+public class ZsyzDbdServiceImpl implements IZsyzDbdService
+{
+    @Autowired
+    private ZsyzDbdMapper zsyzDbdMapper;
+
+    /**
+     * 查询招商引资_督办单
+     * 
+     * @param id 招商引资_督办单主键
+     * @return 招商引资_督办单
+     */
+    @Override
+    public ZsyzDbd selectZsyzDbdById(Long id)
+    {
+        return zsyzDbdMapper.selectZsyzDbdById(id);
+    }
+
+    /**
+     * 查询招商引资_督办单列表
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 招商引资_督办单
+     */
+    @Override
+    public List<ZsyzDbd> selectZsyzDbdList(ZsyzDbd zsyzDbd)
+    {
+        return zsyzDbdMapper.selectZsyzDbdList(zsyzDbd);
+    }
+
+    /**
+     * 新增招商引资_督办单
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzDbd(ZsyzDbd zsyzDbd)
+    {
+        zsyzDbd.setCreateTime(DateUtils.getNowDate());
+        return zsyzDbdMapper.insertZsyzDbd(zsyzDbd);
+    }
+
+    /**
+     * 修改招商引资_督办单
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzDbd(ZsyzDbd zsyzDbd)
+    {
+        zsyzDbd.setUpdateTime(DateUtils.getNowDate());
+        return zsyzDbdMapper.updateZsyzDbd(zsyzDbd);
+    }
+
+    /**
+     * 批量删除招商引资_督办单
+     * 
+     * @param ids 需要删除的招商引资_督办单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzDbdByIds(Long[] ids)
+    {
+        return zsyzDbdMapper.deleteZsyzDbdByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_督办单信息
+     * 
+     * @param id 招商引资_督办单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzDbdById(Long id)
+    {
+        return zsyzDbdMapper.deleteZsyzDbdById(id);
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzJzqk;
+import com.ruoyi.system.mapper.projectV2.ZsyzJzqkMapper;
+import com.ruoyi.system.service.projectV2.IZsyzJzqkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+/**
+ * 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+@Service
+public class ZsyzJzqkServiceImpl implements IZsyzJzqkService
+{
+    @Autowired
+    private ZsyzJzqkMapper zsyzJzqkMapper;
+
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param id 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    @Override
+    public ZsyzJzqk selectZsyzJzqkById(Long id)
+    {
+        return zsyzJzqkMapper.selectZsyzJzqkById(id);
+    }
+
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)列表
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    @Override
+    public List<ZsyzJzqk> selectZsyzJzqkList(ZsyzJzqk zsyzJzqk)
+    {
+        return zsyzJzqkMapper.selectZsyzJzqkList(zsyzJzqk);
+    }
+
+    /**
+     * 新增招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzJzqk(ZsyzJzqk zsyzJzqk)
+    {
+        zsyzJzqk.setCreateTime(DateUtils.getNowDate());
+        return zsyzJzqkMapper.insertZsyzJzqk(zsyzJzqk);
+    }
+
+    /**
+     * 修改招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzJzqk(ZsyzJzqk zsyzJzqk)
+    {
+        zsyzJzqk.setUpdateTime(DateUtils.getNowDate());
+        return zsyzJzqkMapper.updateZsyzJzqk(zsyzJzqk);
+    }
+
+    /**
+     * 批量删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param ids 需要删除的招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzJzqkByIds(Long[] ids)
+    {
+        return zsyzJzqkMapper.deleteZsyzJzqkByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)信息
+     * 
+     * @param id 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzJzqkById(Long id)
+    {
+        return zsyzJzqkMapper.deleteZsyzJzqkById(id);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl.projectV2;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -64,6 +65,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
      * @return 招商引资_申报_首谈信息_主
      */
     @Override
+    @DataScope(deptAlias = "s")
     public List<ZsyzSbbzb> selectZsyzSbbzbList(ZsyzSbbzb zsyzSbbzb) {
         return zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
     }

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

@@ -2,16 +2,30 @@ package com.ruoyi.system.service.impl.projectV2.common;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
+import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
 import com.ruoyi.system.mapper.projectV2.ZsyzSbbzbMapper;
 import com.ruoyi.system.mapper.projectV2.ZsyzShyjMapper;
+import com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper;
 import com.ruoyi.system.service.projectV2.common.IZsyzCommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
@@ -29,6 +43,12 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     @Autowired
     private ZsyzSbbzbMapper zsyzSbbzbMapper;
 
+    @Autowired
+    private ZsyzSkxmMapper zsyzSkxmMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+
     //主要功能, 对线索进度进行控制
     @Override
     public AjaxResult xssh(ZsyzShyj zsyzShyj) {
@@ -51,7 +71,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             //判断项目进度
             zsyzSbbzb.setProgress(changeProgress(progress));
             zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
-        }else if (TWO.equals(shjg)){
+        } else if (TWO.equals(shjg)) {
             //驳回
             zsyzSbbzb.setProgress(changeProgressBack(progress));
             zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
@@ -59,17 +79,114 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         return AjaxResult.success();
     }
 
+    /**
+     * 首页统计接口
+     *
+     * @return
+     */
+    @Override
+    public AjaxResult census() {
+        //先去redis 中查询
+        Map<String, Integer> map = redisCache.getCacheObject(INDEX);
+        if (map == null) {
+            //定义返回值
+            int sk = 0;
+            SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+            ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
+            List<ZsyzSbbzb> zsyzSbbzbs = new ArrayList<>();
+            Long deptId = SecurityUtils.getDeptId();
+            String roleKey = "";
+            // 如果是超级管理员/管理员，则不过滤数据
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (roles != null && roles.size() > 0) {
+                for (SysRole role : roles) {
+                    //获取角色的权限字符串
+                    roleKey = roleKey + "," + role.getRoleKey();
+                    if (MANAGE.equals(roleKey)) {
+                        roleKey = MANAGE;
+                        break;
+                    }
+                }
+            }
+            boolean flag = true;
+            if (StringUtils.isNotNull(currentUser) && (!currentUser.isAdmin() || MANAGE.equals(roleKey))) {
+                //如果不是admin/或者平台管理员 判断是什么角色
+                if (StringUtils.isNotEmpty(roleKey)) {
+                    String[] split = roleKey.split(",");
+                    for (int i = 0; i < split.length; i++) {
+                        if (SZBM.equals(split[i])) {
+                            //如果是市直部门则包含承接地数据
+                            flag = false;
+                        }
+                    }
+                }
+                //如果是FALSE 则包含承接地
+                if (flag) {
+                    //只查询承接地数据
+                    zsyzSbbzb.setCjdId(deptId);
+                    zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
+                } else {
+                    zsyzSbbzb.setDeptId(deptId);
+                    //查询指派给市值和承接地是市值的数据
+                    zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
+                }
+            } else {
+                //如果是admin/或者平台管理员 获取到所有数据
+                zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbList(zsyzSbbzb);
+                //查询省库数据
+                ZsyzSkxm zsyzSkxm = new ZsyzSkxm();
+                zsyzSkxm.setDeptId(deptId);
+                List<ZsyzSkxm> zsyzSkxms = zsyzSkxmMapper.selectZsyzSkxmList(zsyzSkxm);
+                if (zsyzSkxms != null && zsyzSkxms.size() > 0) {
+                    sk = zsyzSkxms.size();
+                }
+            }
+            //对数据进行分组统计
+            int xs = 0;
+            int qy = 0;
+            int kg = 0;
+            int tc = 0;
+            int all = 0;
+            if (zsyzSbbzbs != null && zsyzSbbzbs.size() > 0) {
+                for (ZsyzSbbzb sbbzb : zsyzSbbzbs) {
+                    String progress = sbbzb.getProgress();
+                    if (ONE.equals(progress) || TWO.equals(progress) || THR.equals(progress) || FOR.equals(progress) || FIV.equals(progress)) {
+                        xs = xs + 1;
+                    } else if (SIX.equals(progress) || SEV.equals(progress)) {
+                        qy = qy + 1;
+                    } else if (EIG.equals(progress) || NIN.equals(progress)) {
+                        kg = kg + 1;
+                    } else if (TEN.equals(progress) || ELE.equals(progress)) {
+                        tc = tc + 1;
+                    }
+                }
+                all = zsyzSbbzbs.size();
+            }
+            map.put("xs", xs);
+            map.put("qy", qy);
+            map.put("kg", kg);
+            map.put("tc", tc);
+            map.put("sk", sk);
+            //todo 问题项目 批示 数据放到redis 中缓存, 1小时更新一次
+            map.put("wt", 0);
+            map.put("ps", 0);
+            map.put("all", all);
+            redisCache.setCacheObject(INDEX, map,1, TimeUnit.HOURS);
+        }
+        return AjaxResult.success(map);
+    }
+
     //更改项目进度前进
     public String changeProgress(String progress) {
-        if (ONE.equals(progress)){
+        if (ONE.equals(progress)) {
             progress = TWO;
-        }else if (FOR.equals(progress)){
+        } else if (FOR.equals(progress)) {
             progress = FIV;
-        }else if (SIX.equals(progress)){
+        } else if (SIX.equals(progress)) {
             progress = SEV;
-        }else if (EIG.equals(progress)){
+        } else if (EIG.equals(progress)) {
             progress = NIN;
-        }else if (TEN.equals(progress)){
+        } else if (TEN.equals(progress)) {
             progress = ELE;
         }//项目入归暂时保留
         return progress;
@@ -77,21 +194,21 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
 
     //更改项目进度后退
     public String changeProgressBack(String progress) {
-        if (TWO.equals(progress)){
+        if (TWO.equals(progress)) {
             progress = ONE;
-        }else if (FOR.equals(progress)){
+        } else if (FOR.equals(progress)) {
             progress = TWO;
-        }else if (SIX.equals(progress)){
+        } else if (SIX.equals(progress)) {
             progress = FIV;
-        }else if (EIG.equals(progress)){
+        } else if (EIG.equals(progress)) {
             progress = SEV;
-        }else if (TEN.equals(progress)){
+        } else if (TEN.equals(progress)) {
             progress = NIN;
         }//项目入归暂时保留
         return progress;
     }
 
-        //根据项目进度判断项目阶段
+    //根据项目进度判断项目阶段
     public String xmjd(String code) {
         if (ONE.equals(code) || TWO.equals(code) || THR.equals(code) || FOR.equals(code) || FIV.equals(code)) {
             return "线索阶段";

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzDbd;
+
+import java.util.List;
+
+/**
+ * 招商引资_督办单Service接口
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+public interface IZsyzDbdService 
+{
+    /**
+     * 查询招商引资_督办单
+     * 
+     * @param id 招商引资_督办单主键
+     * @return 招商引资_督办单
+     */
+    public ZsyzDbd selectZsyzDbdById(Long id);
+
+    /**
+     * 查询招商引资_督办单列表
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 招商引资_督办单集合
+     */
+    public List<ZsyzDbd> selectZsyzDbdList(ZsyzDbd zsyzDbd);
+
+    /**
+     * 新增招商引资_督办单
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 结果
+     */
+    public int insertZsyzDbd(ZsyzDbd zsyzDbd);
+
+    /**
+     * 修改招商引资_督办单
+     * 
+     * @param zsyzDbd 招商引资_督办单
+     * @return 结果
+     */
+    public int updateZsyzDbd(ZsyzDbd zsyzDbd);
+
+    /**
+     * 批量删除招商引资_督办单
+     * 
+     * @param ids 需要删除的招商引资_督办单主键集合
+     * @return 结果
+     */
+    public int deleteZsyzDbdByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_督办单信息
+     * 
+     * @param id 招商引资_督办单主键
+     * @return 结果
+     */
+    public int deleteZsyzDbdById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzJzqk;
+
+import java.util.List;
+
+/**
+ * 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)Service接口
+ * 
+ * @author boman
+ * @date 2023-02-25
+ */
+public interface IZsyzJzqkService 
+{
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param id 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     */
+    public ZsyzJzqk selectZsyzJzqkById(Long id);
+
+    /**
+     * 查询招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)列表
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)集合
+     */
+    public List<ZsyzJzqk> selectZsyzJzqkList(ZsyzJzqk zsyzJzqk);
+
+    /**
+     * 新增招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 结果
+     */
+    public int insertZsyzJzqk(ZsyzJzqk zsyzJzqk);
+
+    /**
+     * 修改招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param zsyzJzqk 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * @return 结果
+     */
+    public int updateZsyzJzqk(ZsyzJzqk zsyzJzqk);
+
+    /**
+     * 批量删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)
+     * 
+     * @param ids 需要删除的招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键集合
+     * @return 结果
+     */
+    public int deleteZsyzJzqkByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)信息
+     * 
+     * @param id 招商引资_进展情况(跟督办关系 项目需要按照固定时间内,填写进展情况否则生成督办单)主键
+     * @return 结果
+     */
+    public int deleteZsyzJzqkById(Long id);
+}

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

@@ -18,4 +18,7 @@ public interface IZsyzCommonService
 {
     //主要功能, 对线索进度进行控制
   public AjaxResult xssh(ZsyzShyj zsyzShyj);
+
+  //首页统计接口
+  public AjaxResult census();
 }

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

@@ -0,0 +1,156 @@
+<?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.ZsyzDbdMapper">
+    
+    <resultMap type="ZsyzDbd" id="ZsyzDbdResult">
+        <result property="id"    column="id"    />
+        <result property="dh"    column="dh"    />
+        <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="isHf"    column="is_hf"    />
+        <result property="dbTime"    column="db_time"    />
+        <result property="blsx"    column="blsx"    />
+        <result property="dbsx"    column="dbsx"    />
+        <result property="jzqk"    column="jzqk"    />
+        <result property="czwt"    column="czwt"    />
+        <result property="jjjy"    column="jjjy"    />
+        <result property="gzjh"    column="gzjh"    />
+        <result property="tbr"    column="tbr"    />
+        <result property="phone"    column="phone"    />
+        <result property="tbTime"    column="tb_time"    />
+        <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="selectZsyzDbdVo">
+        select id, dh, xm_id, xmbh, xmmc, dept_id, dept_name, is_hf, db_time, blsx, dbsx, jzqk, czwt, jjjy, gzjh, tbr, phone, tb_time, create_by, create_time, update_by, update_time, remark from zsyz_dbd
+    </sql>
+
+    <select id="selectZsyzDbdList" parameterType="ZsyzDbd" resultMap="ZsyzDbdResult">
+        <include refid="selectZsyzDbdVo"/>
+        <where>  
+            <if test="dh != null  and dh != ''"> and dh = #{dh}</if>
+            <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="isHf != null  and isHf != ''"> and is_hf = #{isHf}</if>
+            <if test="dbTime != null "> and db_time = #{dbTime}</if>
+            <if test="blsx != null  and blsx != ''"> and blsx = #{blsx}</if>
+            <if test="dbsx != null  and dbsx != ''"> and dbsx = #{dbsx}</if>
+            <if test="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
+            <if test="czwt != null  and czwt != ''"> and czwt = #{czwt}</if>
+            <if test="jjjy != null  and jjjy != ''"> and jjjy = #{jjjy}</if>
+            <if test="gzjh != null  and gzjh != ''"> and gzjh = #{gzjh}</if>
+            <if test="tbr != null  and tbr != ''"> and tbr = #{tbr}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="tbTime != null "> and tb_time = #{tbTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzDbdById" parameterType="Long" resultMap="ZsyzDbdResult">
+        <include refid="selectZsyzDbdVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzDbd" parameterType="ZsyzDbd" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_dbd
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dh != null and dh != ''">dh,</if>
+            <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="isHf != null and isHf != ''">is_hf,</if>
+            <if test="dbTime != null">db_time,</if>
+            <if test="blsx != null">blsx,</if>
+            <if test="dbsx != null">dbsx,</if>
+            <if test="jzqk != null">jzqk,</if>
+            <if test="czwt != null">czwt,</if>
+            <if test="jjjy != null">jjjy,</if>
+            <if test="gzjh != null">gzjh,</if>
+            <if test="tbr != null">tbr,</if>
+            <if test="phone != null">phone,</if>
+            <if test="tbTime != null">tb_time,</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="dh != null and dh != ''">#{dh},</if>
+            <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="isHf != null and isHf != ''">#{isHf},</if>
+            <if test="dbTime != null">#{dbTime},</if>
+            <if test="blsx != null">#{blsx},</if>
+            <if test="dbsx != null">#{dbsx},</if>
+            <if test="jzqk != null">#{jzqk},</if>
+            <if test="czwt != null">#{czwt},</if>
+            <if test="jjjy != null">#{jjjy},</if>
+            <if test="gzjh != null">#{gzjh},</if>
+            <if test="tbr != null">#{tbr},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="tbTime != null">#{tbTime},</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="updateZsyzDbd" parameterType="ZsyzDbd">
+        update zsyz_dbd
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dh != null and dh != ''">dh = #{dh},</if>
+            <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="isHf != null and isHf != ''">is_hf = #{isHf},</if>
+            <if test="dbTime != null">db_time = #{dbTime},</if>
+            <if test="blsx != null">blsx = #{blsx},</if>
+            <if test="dbsx != null">dbsx = #{dbsx},</if>
+            <if test="jzqk != null">jzqk = #{jzqk},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
+            <if test="jjjy != null">jjjy = #{jjjy},</if>
+            <if test="gzjh != null">gzjh = #{gzjh},</if>
+            <if test="tbr != null">tbr = #{tbr},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="tbTime != null">tb_time = #{tbTime},</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="deleteZsyzDbdById" parameterType="Long">
+        delete from zsyz_dbd where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzDbdByIds" parameterType="String">
+        delete from zsyz_dbd where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,151 @@
+<?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.ZsyzJzqkMapper">
+    
+    <resultMap type="ZsyzJzqk" id="ZsyzJzqkResult">
+        <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="qtrName"    column="qtr_name"    />
+        <result property="qtTime"    column="qt_time"    />
+        <result property="qtrxz"    column="qtrxz"    />
+        <result property="qtrdwzw"    column="qtrdwzw"    />
+        <result property="phone"    column="phone"    />
+        <result property="blsx"    column="blsx"    />
+        <result property="dbsx"    column="dbsx"    />
+        <result property="jzqk"    column="jzqk"    />
+        <result property="czwt"    column="czwt"    />
+        <result property="jjjy"    column="jjjy"    />
+        <result property="gzjh"    column="gzjh"    />
+        <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="selectZsyzJzqkVo">
+        select id, xm_id, xmbh, xmmc, dept_id, dept_name, qtr_name, qt_time, qtrxz, qtrdwzw, phone, blsx, dbsx, jzqk, czwt, jjjy, gzjh, create_by, create_time, update_by, update_time, remark from zsyz_jzqk
+    </sql>
+
+    <select id="selectZsyzJzqkList" parameterType="ZsyzJzqk" resultMap="ZsyzJzqkResult">
+        <include refid="selectZsyzJzqkVo"/>
+        <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="qtrName != null  and qtrName != ''"> and qtr_name like concat('%', #{qtrName}, '%')</if>
+            <if test="qtTime != null "> and qt_time = #{qtTime}</if>
+            <if test="qtrxz != null  and qtrxz != ''"> and qtrxz = #{qtrxz}</if>
+            <if test="qtrdwzw != null  and qtrdwzw != ''"> and qtrdwzw = #{qtrdwzw}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="blsx != null  and blsx != ''"> and blsx = #{blsx}</if>
+            <if test="dbsx != null  and dbsx != ''"> and dbsx = #{dbsx}</if>
+            <if test="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
+            <if test="czwt != null  and czwt != ''"> and czwt = #{czwt}</if>
+            <if test="jjjy != null  and jjjy != ''"> and jjjy = #{jjjy}</if>
+            <if test="gzjh != null  and gzjh != ''"> and gzjh = #{gzjh}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzJzqkById" parameterType="Long" resultMap="ZsyzJzqkResult">
+        <include refid="selectZsyzJzqkVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzJzqk" parameterType="ZsyzJzqk" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_jzqk
+        <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="qtrName != null and qtrName != ''">qtr_name,</if>
+            <if test="qtTime != null">qt_time,</if>
+            <if test="qtrxz != null">qtrxz,</if>
+            <if test="qtrdwzw != null">qtrdwzw,</if>
+            <if test="phone != null">phone,</if>
+            <if test="blsx != null">blsx,</if>
+            <if test="dbsx != null">dbsx,</if>
+            <if test="jzqk != null">jzqk,</if>
+            <if test="czwt != null">czwt,</if>
+            <if test="jjjy != null">jjjy,</if>
+            <if test="gzjh != null">gzjh,</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="qtrName != null and qtrName != ''">#{qtrName},</if>
+            <if test="qtTime != null">#{qtTime},</if>
+            <if test="qtrxz != null">#{qtrxz},</if>
+            <if test="qtrdwzw != null">#{qtrdwzw},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="blsx != null">#{blsx},</if>
+            <if test="dbsx != null">#{dbsx},</if>
+            <if test="jzqk != null">#{jzqk},</if>
+            <if test="czwt != null">#{czwt},</if>
+            <if test="jjjy != null">#{jjjy},</if>
+            <if test="gzjh != null">#{gzjh},</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="updateZsyzJzqk" parameterType="ZsyzJzqk">
+        update zsyz_jzqk
+        <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="qtrName != null and qtrName != ''">qtr_name = #{qtrName},</if>
+            <if test="qtTime != null">qt_time = #{qtTime},</if>
+            <if test="qtrxz != null">qtrxz = #{qtrxz},</if>
+            <if test="qtrdwzw != null">qtrdwzw = #{qtrdwzw},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="blsx != null">blsx = #{blsx},</if>
+            <if test="dbsx != null">dbsx = #{dbsx},</if>
+            <if test="jzqk != null">jzqk = #{jzqk},</if>
+            <if test="czwt != null">czwt = #{czwt},</if>
+            <if test="jjjy != null">jjjy = #{jjjy},</if>
+            <if test="gzjh != null">gzjh = #{gzjh},</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="deleteZsyzJzqkById" parameterType="Long">
+        delete from zsyz_jzqk where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzJzqkByIds" parameterType="String">
+        delete from zsyz_jzqk where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wfqyr"    column="wfqyr"    />
         <result property="tbrq"    column="tbrq"    />
         <result property="qyrq"    column="qyrq"    />
+        <result property="xytzely"    column="xytzely"    />
         <result property="xytze"    column="xytze"    />
         <result property="swzj"    column="swzj"    />
         <result property="gdzctze"    column="gdzctze"    />
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzQyxxVo">
-        select id, xm_id, xmbh, xmmc, dfqyr, wfqyr, tbrq, qyrq, xytze, swzj, gdzctze, xmgjrxm,xmgjrzw,xmgjrsjh, xmszd, sshy, tzfs, jsfs, sfys, jsnr, zlcf,gdmj, zcqymc, zcrq, zczb, frdb, lxfs, jyfw, lxrq, nkgrq, path, create_by, create_time, update_by, update_time, remark from zsyz_qyxx
+        select id, xm_id, xmbh, xmmc, dfqyr, wfqyr, tbrq, qyrq,xytzely, xytze, swzj, gdzctze, xmgjrxm,xmgjrzw,xmgjrsjh, xmszd, sshy, tzfs, jsfs, sfys, jsnr, zlcf,gdmj, zcqymc, zcrq, zczb, frdb, lxfs, jyfw, lxrq, nkgrq, path, create_by, create_time, update_by, update_time, remark from zsyz_qyxx
     </sql>
 
     <select id="selectZsyzQyxxList" parameterType="ZsyzQyxx" resultMap="ZsyzQyxxResult">
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wfqyr != null  and wfqyr != ''"> and wfqyr = #{wfqyr}</if>
             <if test="tbrq != null "> and tbrq = #{tbrq}</if>
             <if test="qyrq != null "> and qyrq = #{qyrq}</if>
+            <if test="xytzely != null  and xytzely != ''"> and xytzely = #{xytzely}</if>
             <if test="xytze != null  and xytze != ''"> and xytze = #{xytze}</if>
             <if test="swzj != null  and swzj != ''"> and swzj = #{swzj}</if>
             <if test="gdzctze != null  and gdzctze != ''"> and gdzctze = #{gdzctze}</if>
@@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wfqyr != null and wfqyr != ''">wfqyr,</if>
             <if test="tbrq != null">tbrq,</if>
             <if test="qyrq != null">qyrq,</if>
+            <if test="xytzely != null and xytzely != ''">xytzely,</if>
             <if test="xytze != null and xytze != ''">xytze,</if>
             <if test="swzj != null">swzj,</if>
             <if test="gdzctze != null and gdzctze != ''">gdzctze,</if>
@@ -135,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wfqyr != null and wfqyr != ''">#{wfqyr},</if>
             <if test="tbrq != null">#{tbrq},</if>
             <if test="qyrq != null">#{qyrq},</if>
+            <if test="xytzely != null and xytzely != ''">#{xytzely},</if>
             <if test="xytze != null and xytze != ''">#{xytze},</if>
             <if test="swzj != null">#{swzj},</if>
             <if test="gdzctze != null and gdzctze != ''">#{gdzctze},</if>
@@ -176,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wfqyr != null and wfqyr != ''">wfqyr = #{wfqyr},</if>
             <if test="tbrq != null">tbrq = #{tbrq},</if>
             <if test="qyrq != null">qyrq = #{qyrq},</if>
+            <if test="xytzely != null and xytzely != ''">xytzely = #{xytzely},</if>
             <if test="xytze != null and xytze != ''">xytze = #{xytze},</if>
             <if test="swzj != null">swzj = #{swzj},</if>
             <if test="gdzctze != null and gdzctze != ''">gdzctze = #{gdzctze},</if>

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

@@ -54,157 +54,194 @@
         <result property="meetRemark" column="meet_remark"/>
 
 
-        <association property="zsyzQyxx"  javaType="ZsyzQyxx" resultMap="ZsyzQyxxResult" />
-        <association property="zsyzKgxx"  javaType="ZsyzKgxx" resultMap="ZsyzKgxxResult" />
-        <association property="zsyzTcxx"  javaType="ZsyzTcxx" resultMap="ZsyzTcxxResult" />
+        <association property="zsyzQyxx" javaType="ZsyzQyxx" resultMap="ZsyzQyxxResult"/>
+        <association property="zsyzKgxx" javaType="ZsyzKgxx" resultMap="ZsyzKgxxResult"/>
+        <association property="zsyzTcxx" javaType="ZsyzTcxx" resultMap="ZsyzTcxxResult"/>
+        <collection property="shyjList" javaType="java.util.List" resultMap="ZsyzShyjResult"/>
+
     </resultMap>
 
     <!--签约信息-->
     <resultMap type="ZsyzQyxx" id="ZsyzQyxxResult">
-        <result property="id"    column="id"    />
-        <result property="xmId"    column="xm_id"    />
-        <result property="xmbh"    column="xmbh"    />
-        <result property="xmmc"    column="xmmc"    />
-        <result property="dfqyr"    column="dfqyr"    />
-        <result property="wfqyr"    column="wfqyr"    />
-        <result property="tbrq"    column="tbrq"    />
-        <result property="qyrq"    column="qyrq"    />
-        <result property="xytze"    column="xytze"    />
-        <result property="swzj"    column="swzj"    />
-        <result property="gdzctze"    column="gdzctze"    />
-        <result property="qygjrsjh"    column="qygjrsjh"    />
-        <result property="xmszd"    column="xmszd"    />
-        <result property="sshy"    column="sshy"    />
-        <result property="tzfs"    column="tzfs"    />
-        <result property="jsfs"    column="jsfs"    />
-        <result property="sfys"    column="sfys"    />
-        <result property="jsnr"    column="jsnr"    />
-        <result property="ydmj"    column="ydmj"    />
-        <result property="zcqymc"    column="zcqymc"    />
-        <result property="zcrq"    column="zcrq"    />
-        <result property="zczb"    column="zczb"    />
-        <result property="frdb"    column="frdb"    />
-        <result property="lxfs"    column="lxfs"    />
-        <result property="jyfw"    column="jyfw"    />
-        <result property="lxrq"    column="lxrq"    />
-        <result property="nkgrq"    column="nkgrq"    />
-        <result property="path"    column="path"    />
-        <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"    />
+        <result property="id" column="id"/>
+        <result property="xmId" column="xm_id"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="dfqyr" column="dfqyr"/>
+        <result property="wfqyr" column="wfqyr"/>
+        <result property="tbrq" column="tbrq"/>
+        <result property="qyrq" column="qyrq"/>
+        <result property="xytze" column="xytze"/>
+        <result property="swzj" column="swzj"/>
+        <result property="gdzctze" column="gdzctze"/>
+        <result property="xmgjrxm" column="xmgjrxm"/>
+        <result property="xmgjrzw" column="xmgjrzw"/>
+        <result property="xmgjrsjh" column="xmgjrsjh"/>
+        <result property="xmszd" column="xmszd"/>
+        <result property="sshy" column="sshy"/>
+        <result property="tzfs" column="tzfs"/>
+        <result property="jsfs" column="jsfs"/>
+        <result property="sfys" column="sfys"/>
+        <result property="jsnr" column="jsnr"/>
+        <result property="zlcf" column="zlcf"/>
+        <result property="gdmj" column="gdmj"/>
+        <result property="zcqymc" column="zcqymc"/>
+        <result property="zcrq" column="zcrq"/>
+        <result property="zczb" column="zczb"/>
+        <result property="frdb" column="frdb"/>
+        <result property="lxfs" column="lxfs"/>
+        <result property="jyfw" column="jyfw"/>
+        <result property="lxrq" column="lxrq"/>
+        <result property="nkgrq" column="nkgrq"/>
+        <result property="path" column="path"/>
+        <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>
 
     <!--开工信息-->
     <resultMap type="ZsyzKgxx" id="ZsyzKgxxResult">
-        <result property="id"    column="id"    />
-        <result property="xmId"    column="xm_id"    />
-        <result property="xmbh"    column="xmbh"    />
-        <result property="xmmc"    column="xmmc"    />
-        <result property="kgrq"    column="kgrq"    />
-        <result property="njgrq"    column="njgrq"    />
-        <result property="sscrq"    column="sscrq"    />
-        <result property="ntcsj"    column="ntcsj"    />
-        <result property="rtsj"    column="rtsj"    />
-        <result property="nrtsj"    column="nrtsj"    />
-        <result property="kggjrsjh"    column="kggjrsjh"    />
-        <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"    />
+        <result property="id" column="id"/>
+        <result property="xmId" column="xm_id"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="kgrq" column="kgrq"/>
+        <result property="njgrq" column="njgrq"/>
+        <result property="sscrq" column="sscrq"/>
+        <result property="ntcsj" column="ntcsj"/>
+        <result property="rtsj" column="rtsj"/>
+        <result property="nrtsj" column="nrtsj"/>
+        <result property="kggjrsjh" column="kggjrsjh"/>
+        <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>
 
     <!--投产信息-->
     <resultMap type="ZsyzTcxx" id="ZsyzTcxxResult">
-        <result property="id"    column="id"    />
-        <result property="xmId"    column="xm_id"    />
-        <result property="xmbh"    column="xmbh"    />
-        <result property="xmmc"    column="xmmc"    />
-        <result property="tcrq"    column="tcrq"    />
-        <result property="rgsj"    column="rgsj"    />
-        <result property="nrgsj"    column="nrgsj"    />
-        <result property="tcgjrsjh"    column="tcgjrsjh"    />
-        <result property="sjdze"    column="sjdze"    />
-        <result property="ydmj"    column="ydmj"    />
-        <result property="tdcr"    column="tdcr"    />
-        <result property="xjcf"    column="xjcf"    />
-        <result property="cftr"    column="cftr"    />
-        <result property="sbqd"    column="sbqd"    />
-        <result property="sbfp"    column="sbfp"    />
-        <result property="sbht"    column="sbht"    />
-        <result property="fkpz"    column="fkpz"    />
-        <result property="zlcf"    column="zlcf"    />
-        <result property="zlcftr"    column="zlcftr"    />
-        <result property="zlsbqd"    column="zlsbqd"    />
-        <result property="zlsbfp"    column="zlsbfp"    />
-        <result property="zlsbht"    column="zlsbht"    />
-        <result property="zlfkpz"    column="zlfkpz"    />
-        <result property="sjss"    column="sjss"    />
-        <result property="lxy"    column="lxy"    />
-        <result property="jnsb"    column="jnsb"    />
-        <result property="zbtr"    column="zbtr"    />
-        <result property="ndsjss"    column="ndsjss"    />
-        <result property="qt"    column="qt"    />
-        <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"    />
+        <result property="id" column="id"/>
+        <result property="xmId" column="xm_id"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="tcrq" column="tcrq"/>
+        <result property="rgsj" column="rgsj"/>
+        <result property="nrgsj" column="nrgsj"/>
+        <result property="tcgjrsjh" column="tcgjrsjh"/>
+        <result property="sjdze" column="sjdze"/>
+        <result property="ydmj" column="ydmj"/>
+        <result property="tdcr" column="tdcr"/>
+        <result property="xjcf" column="xjcf"/>
+        <result property="cftr" column="cftr"/>
+        <result property="sbqd" column="sbqd"/>
+        <result property="sbfp" column="sbfp"/>
+        <result property="sbht" column="sbht"/>
+        <result property="fkpz" column="fkpz"/>
+        <result property="zlcf" column="zlcf"/>
+        <result property="zlcftr" column="zlcftr"/>
+        <result property="zlsbqd" column="zlsbqd"/>
+        <result property="zlsbfp" column="zlsbfp"/>
+        <result property="zlsbht" column="zlsbht"/>
+        <result property="zlfkpz" column="zlfkpz"/>
+        <result property="sjss" column="sjss"/>
+        <result property="lxy" column="lxy"/>
+        <result property="jnsb" column="jnsb"/>
+        <result property="zbtr" column="zbtr"/>
+        <result property="ndsjss" column="ndsjss"/>
+        <result property="qt" column="qt"/>
+        <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>
 
-
+    <resultMap type="ZsyzShyj" id="ZsyzShyjResult">
+        <result property="id" column="id"/>
+        <result property="xmId" column="xm_id"/>
+        <result property="xmbh" column="xmbh"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="shrxm" column="shrxm"/>
+        <result property="xmjd" column="xmjd"/>
+        <result property="xmmc" column="xmmc"/>
+        <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="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, 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">
-        <include refid="selectZsyzSbbzbVo"/>
+        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,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
+        s.is_del, s.update_time, s.remark, s.cjd_id,
+        s.cjd_name, s.is_meet, s.meet_remark,
+        j.id,j.xm_id,j.xmbh,j.xmmc,j.dept_id,j.shrxm,j.xmjd,j.shjg,j.shyj,j.shsj
+        from zsyz_sbbzb s
+        left join zsyz_shyj j on s.id = j.xm_id
         <where>
-            is_del = 'N'
-            <if test="sbdw != null  and sbdw != ''">and sbdw = #{sbdw}</if>
-            <if test="tbrq != null ">and tbrq = #{tbrq}</if>
-            <if test="zszxfzr != null  and zszxfzr != ''">and zszxfzr = #{zszxfzr}</if>
-            <if test="xmbh != null  and xmbh != ''">and xmbh = #{xmbh}</if>
-            <if test="xmxsmc != null  and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
-            <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and sfwlhxxxm = #{sfwlhxxxm}</if>
-            <if test="yzdqId != null  and yzdqId != ''">and yzdq_id = #{yzdqId}</if>
-            <if test="yzdqName != null  and yzdqName != ''">and yzdq_name like concat('%', #{yzdqName}, '%')</if>
-            <if test="yzssName != null  and yzssName != ''">and yzss_name like concat('%', #{yzssName}, '%')</if>
-            <if test="ntze != null  and ntze != ''">and ntze = #{ntze}</if>
-            <if test="cylxId != null  and cylxId != ''">and cylx_id = #{cylxId}</if>
-            <if test="cylxName != null  and cylxName != ''">and cylx_name like concat('%', #{cylxName}, '%')</if>
-            <if test="xmlb != null  and xmlb != ''">and xmlb = #{xmlb}</if>
-            <if test="tzlb != null  and tzlb != ''">and tzlb = #{tzlb}</if>
-            <if test="nlhd != null  and nlhd != ''">and nlhd = #{nlhd}</if>
-            <if test="czpt != null  and czpt != ''">and czpt = #{czpt}</if>
-            <if test="tzzt != null  and tzzt != ''">and tzzt = #{tzzt}</if>
-            <if test="xmjz != null  and xmjz != ''">and xmjz = #{xmjz}</if>
-            <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''">and gtzzrsfzhm = #{gtzzrsfzhm}</if>
-            <if test="qytzrxyzdm != null  and qytzrxyzdm != ''">and qytzrxyzdm = #{qytzrxyzdm}</if>
-            <if test="qybj != null  and qybj != ''">and qybj = #{qybj}</if>
-            <if test="tzfjj != null  and tzfjj != ''">and tzfjj = #{tzfjj}</if>
-            <if test="sndxse != null  and sndxse != ''">and sndxse = #{sndxse}</if>
-            <if test="sndnse != null  and sndnse != ''">and sndnse = #{sndnse}</if>
-            <if test="tzrxm != null  and tzrxm != ''">and tzrxm = #{tzrxm}</if>
-            <if test="tzrzw != null  and tzrzw != ''">and tzrzw = #{tzrzw}</if>
-            <if test="tzrdh != null  and tzrdh != ''">and tzrdh = #{tzrdh}</if>
-            <if test="xmjj != null  and xmjj != ''">and xmjj = #{xmjj}</if>
-            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
-            <if test="strq != null ">and strq = #{strq}</if>
-            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
-            <if test="zw != null  and zw != ''">and zw = #{zw}</if>
-            <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="type != null  and type != ''">and type = #{type}</if>
-            <if test="progress != null  and progress != ''">and progress in (#{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>
+            s.is_del = 'N'
+            <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
+            <if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
+            <if test="zszxfzr != null  and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
+            <if test="xmbh != null  and xmbh != ''">and s.xmbh = #{xmbh}</if>
+            <if test="xmxsmc != null  and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
+            <if test="sfwlhxxxm != null  and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
+            <if test="yzdqId != null  and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
+            <if test="yzdqName != null  and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
+            <if test="yzssName != null  and yzssName != ''">and s.yzss_name like concat('%', #{yzssName}, '%')</if>
+            <if test="ntze != null  and ntze != ''">and s.ntze = #{ntze}</if>
+            <if test="cylxId != null  and cylxId != ''">and s.cylx_id = #{cylxId}</if>
+            <if test="cylxName != null  and cylxName != ''">and s.cylx_name like concat('%', #{cylxName}, '%')</if>
+            <if test="xmlb != null  and xmlb != ''">and s.xmlb = #{xmlb}</if>
+            <if test="tzlb != null  and tzlb != ''">and s.tzlb = #{tzlb}</if>
+            <if test="nlhd != null  and nlhd != ''">and s.nlhd = #{nlhd}</if>
+            <if test="czpt != null  and czpt != ''">and s.czpt = #{czpt}</if>
+            <if test="tzzt != null  and tzzt != ''">and s.tzzt = #{tzzt}</if>
+            <if test="xmjz != null  and xmjz != ''">and s.xmjz = #{xmjz}</if>
+            <if test="gtzzrsfzhm != null  and gtzzrsfzhm != ''">and s.gtzzrsfzhm = #{gtzzrsfzhm}</if>
+            <if test="qytzrxyzdm != null  and qytzrxyzdm != ''">and s.qytzrxyzdm = #{qytzrxyzdm}</if>
+            <if test="qybj != null  and qybj != ''">and s.qybj = #{qybj}</if>
+            <if test="tzfjj != null  and tzfjj != ''">and s.tzfjj = #{tzfjj}</if>
+            <if test="sndxse != null  and sndxse != ''">and s.sndxse = #{sndxse}</if>
+            <if test="sndnse != null  and sndnse != ''">and s.sndnse = #{sndnse}</if>
+            <if test="tzrxm != null  and tzrxm != ''">and s.tzrxm = #{tzrxm}</if>
+            <if test="tzrzw != null  and tzrzw != ''">and s.tzrzw = #{tzrzw}</if>
+            <if test="tzrdh != null  and tzrdh != ''">and s.tzrdh = #{tzrdh}</if>
+            <if test="xmjj != null  and xmjj != ''">and s.xmjj = #{xmjj}</if>
+            <if test="name != null  and name != ''">and s.name like concat('%', #{name}, '%')</if>
+            <if test="strq != null ">and s.strq = #{strq}</if>
+            <if test="phone != null  and phone != ''">and s.phone = #{phone}</if>
+            <if test="zw != null  and zw != ''">and s.zw = #{zw}</if>
+            <if test="userId != null ">and s.user_id = #{userId}</if>
+            <if test="type != null  and type != ''">and s.type = #{type}</if>
+            <if test="progress != null  and progress != ''">and s.progress in (#{progress})</if>
+            <if test="isDel != null  and isDel != ''">and s.is_del = #{isDel}</if>
+            <if test="cjdId != null ">and s.cjd_id = #{cjdId}</if>
+            <if test="cjdName != null  and cjdName != ''">and s.cjd_name like concat('%', #{cjdName}, '%')</if>
+            <if test="isMeet != null  and isMeet != ''">and s.is_meet = #{isMeet}</if>
+            <if test="meetRemark != null  and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(s.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
 
     <select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
@@ -213,21 +250,29 @@
     </select>
 
     <select id="selectZsyzSbbzbListDc" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
-        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, s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
-        s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by, s.is_del, s.update_time, s.remark, s.cjd_id,
+        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,
+        s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
+        s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,
-        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.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.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,
+        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.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.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,
         k.update_time, k.remark,
-        t.id, t.xm_id, t.xmbh, t.xmmc, t.tcrq, t.rgsj, t.nrgsj, t.tcgjrsjh, t.sjdze, t.ydmj, t.tdcr, t.xjcf, t.cftr, t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
-        t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by, t.create_time, t.update_by,
+        t.id, t.xm_id, t.xmbh, t.xmmc, t.tcrq, t.rgsj, t.nrgsj, t.tcgjrsjh, t.sjdze, t.ydmj, t.tdcr, t.xjcf, t.cftr,
+        t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
+        t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by,
+        t.create_time, t.update_by,
         t.update_time, t.remark
         from zsyz_sbbzb s
-        left join  zsyz_qyxx q on s.id = q.xm_id
-        left join  zsyz_kgxx k on s.id = k.xm_id
-        left join  zsyz_tcxx t on s.id = t.xm_id
+        left join zsyz_qyxx q on s.id = q.xm_id
+        left join zsyz_kgxx k on s.id = k.xm_id
+        left join zsyz_tcxx t on s.id = t.xm_id
         <where>
             s.is_del = 'N'
             <if test="sbdw != null  and sbdw != ''">and s.sbdw = #{sbdw}</if>
@@ -273,6 +318,16 @@
             <if test="meetRemark != null  and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
         </where>
     </select>
+    <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
+        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, s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
+        s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by, s.is_del, s.update_time, s.remark, s.cjd_id,
+        s.cjd_name, s.is_meet, s.meet_remark
+        from zsyz_project_dept d
+        left join zsyz_sbbzb s on s.id = d.xm_id
+      where  s.is_del = 'N'
+      and (d.dept_id = #{deptId} or s.depe_id = #{deptId})
+    </select>
 
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_sbbzb
@@ -435,7 +490,7 @@
             <if test="type != null and type != ''">type = #{type},</if>
             <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
         </trim>
-      where id = #{id}
+        where id = #{id}
     </update>
     <update id="updateZsyzSbbzbProgress" parameterType="ZsyzSbbzb">
          update zsyz_sbbzb set progress = #{progress} where id = #{id}

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

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="shsj != null "> and shsj = #{shsj}</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}

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

@@ -23,6 +23,7 @@
         <result property="shName" column="sh_name"/>
         <result property="shTime" column="sh_time"/>
         <result property="shJy" column="sh_jy"/>
+        <result property="deptId" column="dept_id"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -31,7 +32,7 @@
     </resultMap>
 
     <sql id="selectZsyzSkxmVo">
-        select id, xmmc, pzwh, tzdw, xmszd, sscy, ztze, swzj, sjdz, dydw, rk_time, qytb_time, is_hs, jsjd, is_sh, sh_name, sh_time, sh_jy, create_by, create_time, update_by, update_time, remark from zsyz_skxm
+        select id, xmmc, pzwh, tzdw, xmszd, sscy, ztze, swzj, sjdz, dydw, rk_time, qytb_time, is_hs, jsjd, is_sh, sh_name, sh_time, sh_jy,dept_id, create_by, create_time, update_by, update_time, remark from zsyz_skxm
     </sql>
 
     <select id="selectZsyzSkxmList" parameterType="ZsyzSkxm" resultMap="ZsyzSkxmResult">
@@ -54,6 +55,7 @@
             <if test="shName != null  and shName != ''">and sh_name like concat('%', #{shName}, '%')</if>
             <if test="shTime != null ">and sh_time = #{shTime}</if>
             <if test="shJy != null  and shJy != ''">and sh_jy = #{shJy}</if>
+            <if test="deptId != null  and deptId != ''">and dept_id = #{deptId}</if>
         </where>
     </select>
 
@@ -82,6 +84,7 @@
             <if test="shName != null">sh_name,</if>
             <if test="shTime != null">sh_time,</if>
             <if test="shJy != null">sh_jy,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -106,6 +109,7 @@
             <if test="shName != null">#{shName},</if>
             <if test="shTime != null">#{shTime},</if>
             <if test="shJy != null">#{shJy},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -134,6 +138,7 @@
             <if test="shName != null">sh_name = #{shName},</if>
             <if test="shTime != null">sh_time = #{shTime},</if>
             <if test="shJy != null">sh_jy = #{shJy},</if>
+            <if test="deptId != null">dept_id = #{deptId},</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>