新增 V2版本项目申报

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

@@ -0,0 +1,115 @@
+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.ZsyzSkxm;
+import com.ruoyi.system.service.projectV2.IZsyzSkxmService;
+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-24
+ */
+@RestController
+@RequestMapping("/projectV2/skxm")
+public class ZsyzSkxmController extends BaseController
+{
+    @Autowired
+    private IZsyzSkxmService zsyzSkxmService;
+
+    /**
+     * 查询招商引资_省库项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzSkxm zsyzSkxm)
+    {
+        startPage();
+        List<ZsyzSkxm> list = zsyzSkxmService.selectZsyzSkxmList(zsyzSkxm);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_省库项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:export')")
+    @Log(title = "招商引资_省库项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzSkxm zsyzSkxm)
+    {
+        List<ZsyzSkxm> list = zsyzSkxmService.selectZsyzSkxmList(zsyzSkxm);
+        ExcelUtil<ZsyzSkxm> util = new ExcelUtil<ZsyzSkxm>(ZsyzSkxm.class);
+        util.exportExcel(response, list, "招商引资_省库项目数据");
+    }
+
+    /**
+     * 获取招商引资_省库项目详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzSkxmService.selectZsyzSkxmById(id));
+    }
+
+    /**
+     * 新增招商引资_省库项目
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:add')")
+    @Log(title = "招商引资_省库项目", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzSkxm zsyzSkxm)
+    {
+        return toAjax(zsyzSkxmService.insertZsyzSkxm(zsyzSkxm));
+    }
+
+    /**
+     * 修改招商引资_省库项目
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:edit')")
+    @Log(title = "招商引资_省库项目", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZsyzSkxm zsyzSkxm)
+    {
+        return toAjax(zsyzSkxmService.updateZsyzSkxm(zsyzSkxm));
+    }
+
+    /**
+     * 删除招商引资_省库项目
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:remove')")
+    @Log(title = "招商引资_省库项目", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzSkxmService.deleteZsyzSkxmByIds(ids));
+    }
+
+    /**
+     * 招商引资_省库项目审核
+     */
+    @PreAuthorize("@ss.hasPermi('projectV2:skxm:sh')")
+    @GetMapping("/sh")
+    public AjaxResult sh(ZsyzSkxm zsyzSkxm)
+    {
+        return toAjax(zsyzSkxmService.updateZsyzSkxmSh(zsyzSkxm));
+    }
+}

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

@@ -28,7 +28,7 @@ public class ZsyzShyj extends BaseEntity
 
     /** 审核人id */
     @Excel(name = "审核人id 部门id")
-    private Long shrId;
+    private Long deptId;
 
     /** 审核人姓名 */
     @Excel(name = "审核人姓名 部门名称")
@@ -77,16 +77,16 @@ public class ZsyzShyj extends BaseEntity
     {
         return xmbh;
     }
-    public void setShrId(Long shrId) 
-    {
-        this.shrId = shrId;
+
+    public Long getDeptId() {
+        return deptId;
     }
 
-    public Long getShrId() 
-    {
-        return shrId;
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
     }
-    public void setShrxm(String shrxm) 
+
+    public void setShrxm(String shrxm)
     {
         this.shrxm = shrxm;
     }
@@ -138,7 +138,7 @@ public class ZsyzShyj extends BaseEntity
             .append("id", getId())
             .append("xmId", getXmId())
             .append("xmbh", getXmbh())
-            .append("shrId", getShrId())
+            .append("deptId", getDeptId())
             .append("shrxm", getShrxm())
             .append("xmjd", getXmjd())
             .append("shjg", getShjg())

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

@@ -0,0 +1,285 @@
+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_skxm
+ * 
+ * @author boman
+ * @date 2023-02-24
+ */
+public class ZsyzSkxm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+    /** 批准文号（请统一填写为项目编码） */
+    @Excel(name = "批准文号（请统一填写为项目编码）")
+    private String pzwh;
+
+    /** 投资单位 */
+    @Excel(name = "投资单位")
+    private String tzdw;
+
+    /** 项目所在地 */
+    @Excel(name = "项目所在地")
+    private String xmszd;
+
+    /** 所属产业 */
+    @Excel(name = "所属产业")
+    private String sscy;
+
+    /** 总投资额(万元) */
+    @Excel(name = "总投资额(万元)")
+    private String ztze;
+
+    /** 省外资金(万元) */
+    @Excel(name = "省外资金(万元)")
+    private String swzj;
+
+    /** 实际到位资金(万元) */
+    @Excel(name = "实际到位资金(万元)")
+    private String sjdz;
+
+    /** 当月到位(万元) */
+    @Excel(name = "当月到位(万元)")
+    private String dydw;
+
+    /** 入库日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date rkTime;
+
+    /** 签约通报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "签约通报时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date qytbTime;
+
+    /** 是否徽商项目 N:否 Y:是 */
+    @Excel(name = "是否徽商项目",readConverterExp = "N=否 Y=是")
+    private String isHs;
+
+    /** 最新建设进度 （简要填写，新建项目是否出正负零，在建项目突出关键建设节点） */
+    @Excel(name = "最新建设进度 ")
+    private String jsjd;
+
+    /** 是否审核 1:未审核 2:已审核 3.已拒绝 */
+    @Excel(name = "是否审核",readConverterExp = "1=未审核,2=已审核,3=已拒绝")
+    private String isSh;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String shName;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shTime;
+
+    /** 审核建议 */
+    @Excel(name = "审核建议")
+    private String shJy;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmmc(String xmmc) 
+    {
+        this.xmmc = xmmc;
+    }
+
+    public String getXmmc() 
+    {
+        return xmmc;
+    }
+    public void setPzwh(String pzwh) 
+    {
+        this.pzwh = pzwh;
+    }
+
+    public String getPzwh() 
+    {
+        return pzwh;
+    }
+    public void setTzdw(String tzdw) 
+    {
+        this.tzdw = tzdw;
+    }
+
+    public String getTzdw() 
+    {
+        return tzdw;
+    }
+    public void setXmszd(String xmszd) 
+    {
+        this.xmszd = xmszd;
+    }
+
+    public String getXmszd() 
+    {
+        return xmszd;
+    }
+    public void setSscy(String sscy) 
+    {
+        this.sscy = sscy;
+    }
+
+    public String getSscy() 
+    {
+        return sscy;
+    }
+    public void setZtze(String ztze) 
+    {
+        this.ztze = ztze;
+    }
+
+    public String getZtze() 
+    {
+        return ztze;
+    }
+    public void setSwzj(String swzj) 
+    {
+        this.swzj = swzj;
+    }
+
+    public String getSwzj() 
+    {
+        return swzj;
+    }
+    public void setSjdz(String sjdz) 
+    {
+        this.sjdz = sjdz;
+    }
+
+    public String getSjdz() 
+    {
+        return sjdz;
+    }
+    public void setDydw(String dydw) 
+    {
+        this.dydw = dydw;
+    }
+
+    public String getDydw() 
+    {
+        return dydw;
+    }
+    public void setRkTime(Date rkTime) 
+    {
+        this.rkTime = rkTime;
+    }
+
+    public Date getRkTime() 
+    {
+        return rkTime;
+    }
+    public void setQytbTime(Date qytbTime) 
+    {
+        this.qytbTime = qytbTime;
+    }
+
+    public Date getQytbTime() 
+    {
+        return qytbTime;
+    }
+    public void setIsHs(String isHs) 
+    {
+        this.isHs = isHs;
+    }
+
+    public String getIsHs() 
+    {
+        return isHs;
+    }
+    public void setJsjd(String jsjd) 
+    {
+        this.jsjd = jsjd;
+    }
+
+    public String getJsjd() 
+    {
+        return jsjd;
+    }
+    public void setIsSh(String isSh) 
+    {
+        this.isSh = isSh;
+    }
+
+    public String getIsSh() 
+    {
+        return isSh;
+    }
+    public void setShName(String shName) 
+    {
+        this.shName = shName;
+    }
+
+    public String getShName() 
+    {
+        return shName;
+    }
+    public void setShTime(Date shTime) 
+    {
+        this.shTime = shTime;
+    }
+
+    public Date getShTime() 
+    {
+        return shTime;
+    }
+    public void setShJy(String shJy) 
+    {
+        this.shJy = shJy;
+    }
+
+    public String getShJy() 
+    {
+        return shJy;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmmc", getXmmc())
+            .append("pzwh", getPzwh())
+            .append("tzdw", getTzdw())
+            .append("xmszd", getXmszd())
+            .append("sscy", getSscy())
+            .append("ztze", getZtze())
+            .append("swzj", getSwzj())
+            .append("sjdz", getSjdz())
+            .append("dydw", getDydw())
+            .append("rkTime", getRkTime())
+            .append("qytbTime", getQytbTime())
+            .append("isHs", getIsHs())
+            .append("jsjd", getJsjd())
+            .append("isSh", getIsSh())
+            .append("shName", getShName())
+            .append("shTime", getShTime())
+            .append("shJy", getShJy())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
+
+import java.util.List;
+
+/**
+ * 招商引资_省库项目Mapper接口
+ * 
+ * @author boman
+ * @date 2023-02-24
+ */
+public interface ZsyzSkxmMapper 
+{
+    /**
+     * 查询招商引资_省库项目
+     * 
+     * @param id 招商引资_省库项目主键
+     * @return 招商引资_省库项目
+     */
+    public ZsyzSkxm selectZsyzSkxmById(Long id);
+
+    /**
+     * 查询招商引资_省库项目列表
+     * 
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 招商引资_省库项目集合
+     */
+    public List<ZsyzSkxm> selectZsyzSkxmList(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 新增招商引资_省库项目
+     * 
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 结果
+     */
+    public int insertZsyzSkxm(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 修改招商引资_省库项目
+     * 
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 结果
+     */
+    public int updateZsyzSkxm(ZsyzSkxm zsyzSkxm);
+    public int updateZsyzSkxmSh(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 删除招商引资_省库项目
+     * 
+     * @param id 招商引资_省库项目主键
+     * @return 结果
+     */
+    public int deleteZsyzSkxmById(Long id);
+
+    /**
+     * 批量删除招商引资_省库项目
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzSkxmByIds(Long[] ids);
+}

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl.projectV2;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
 import com.ruoyi.system.mapper.projectV2.ZsyzShyjMapper;
@@ -40,6 +41,7 @@ public class ZsyzShyjServiceImpl implements IZsyzShyjService
      * @return 招商引资_审核意见
      */
     @Override
+    @DataScope
     public List<ZsyzShyj> selectZsyzShyjList(ZsyzShyj zsyzShyj)
     {
         return zsyzShyjMapper.selectZsyzShyjList(zsyzShyj);

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

@@ -0,0 +1,109 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
+import com.ruoyi.system.mapper.projectV2.ZsyzSkxmMapper;
+import com.ruoyi.system.service.projectV2.IZsyzSkxmService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 招商引资_省库项目Service业务层处理
+ *
+ * @author boman
+ * @date 2023-02-24
+ */
+@Service
+public class ZsyzSkxmServiceImpl implements IZsyzSkxmService {
+    @Autowired
+    private ZsyzSkxmMapper zsyzSkxmMapper;
+
+    /**
+     * 查询招商引资_省库项目
+     *
+     * @param id 招商引资_省库项目主键
+     * @return 招商引资_省库项目
+     */
+    @Override
+    public ZsyzSkxm selectZsyzSkxmById(Long id) {
+        return zsyzSkxmMapper.selectZsyzSkxmById(id);
+    }
+
+    /**
+     * 查询招商引资_省库项目列表
+     *
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 招商引资_省库项目
+     */
+    @Override
+    public List<ZsyzSkxm> selectZsyzSkxmList(ZsyzSkxm zsyzSkxm) {
+        return zsyzSkxmMapper.selectZsyzSkxmList(zsyzSkxm);
+    }
+
+    /**
+     * 新增招商引资_省库项目
+     *
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzSkxm(ZsyzSkxm zsyzSkxm) {
+        zsyzSkxm.setCreateTime(DateUtils.getNowDate());
+        return zsyzSkxmMapper.insertZsyzSkxm(zsyzSkxm);
+    }
+
+    /**
+     * 修改招商引资_省库项目
+     *
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzSkxm(ZsyzSkxm zsyzSkxm) {
+        zsyzSkxm.setUpdateTime(DateUtils.getNowDate());
+        return zsyzSkxmMapper.updateZsyzSkxm(zsyzSkxm);
+    }
+
+    /**
+     * 招商引资_省库项目审核
+     *
+     * @param zsyzSkxm
+     * @return
+     */
+    @Override
+    public int updateZsyzSkxmSh(ZsyzSkxm zsyzSkxm) {
+         String deptName = SecurityUtils.getLoginUser().getUser().getDept().getDeptName();
+        zsyzSkxm.setShName(deptName);
+        zsyzSkxm.setShTime(new Date());
+        return zsyzSkxmMapper.updateZsyzSkxmSh(zsyzSkxm);
+    }
+
+    /**
+     * 批量删除招商引资_省库项目
+     *
+     * @param ids 需要删除的招商引资_省库项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzSkxmByIds(Long[] ids) {
+        return zsyzSkxmMapper.deleteZsyzSkxmByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_省库项目信息
+     *
+     * @param id 招商引资_省库项目主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzSkxmById(Long id) {
+        return zsyzSkxmMapper.deleteZsyzSkxmById(id);
+    }
+}

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

@@ -37,7 +37,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //往审核意见表插入数据
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysDept dept = loginUser.getUser().getDept();
-        zsyzShyj.setShrId(dept.getDeptId());
+        zsyzShyj.setDeptId(dept.getDeptId());
         zsyzShyj.setShrxm(dept.getDeptName());
         //判断项目阶段
         String progress = zsyzShyj.getXmjd();

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

@@ -0,0 +1,70 @@
+package com.ruoyi.system.service.projectV2;
+
+import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
+
+import java.util.List;
+
+
+/**
+ * 招商引资_省库项目Service接口
+ * 
+ * @author boman
+ * @date 2023-02-24
+ */
+public interface IZsyzSkxmService 
+{
+    /**
+     * 查询招商引资_省库项目
+     * 
+     * @param id 招商引资_省库项目主键
+     * @return 招商引资_省库项目
+     */
+    public ZsyzSkxm selectZsyzSkxmById(Long id);
+
+    /**
+     * 查询招商引资_省库项目列表
+     * 
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 招商引资_省库项目集合
+     */
+    public List<ZsyzSkxm> selectZsyzSkxmList(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 新增招商引资_省库项目
+     * 
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 结果
+     */
+    public int insertZsyzSkxm(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 修改招商引资_省库项目
+     * 
+     * @param zsyzSkxm 招商引资_省库项目
+     * @return 结果
+     */
+    public int updateZsyzSkxm(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 招商引资_省库项目审核
+     * @param zsyzSkxm
+     * @return
+     */
+    public int updateZsyzSkxmSh(ZsyzSkxm zsyzSkxm);
+
+    /**
+     * 批量删除招商引资_省库项目
+     * 
+     * @param ids 需要删除的招商引资_省库项目主键集合
+     * @return 结果
+     */
+    public int deleteZsyzSkxmByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_省库项目信息
+     * 
+     * @param id 招商引资_省库项目主键
+     * @return 结果
+     */
+    public int deleteZsyzSkxmById(Long id);
+}

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

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="xmId"    column="xm_id"    />
         <result property="xmbh"    column="xmbh"    />
-        <result property="shrId"    column="shr_id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="shrxm"    column="shrxm"    />
         <result property="xmjd"    column="xmjd"    />
         <result property="shjg"    column="shjg"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZsyzShyjVo">
-        select id, xm_id, xmbh, shr_id, shrxm, xmjd, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zsyz_shyj
+        select id, xm_id, xmbh, dept_id, shrxm, xmjd, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zsyz_shyj
     </sql>
 
     <select id="selectZsyzShyjList" parameterType="ZsyzShyj" resultMap="ZsyzShyjResult">
@@ -30,13 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="xmId != null "> and xm_id = #{xmId}</if>
             <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="shrId != null "> and shr_id = #{shrId}</if>
             <if test="shrxm != null  and shrxm != ''"> and shrxm = #{shrxm}</if>
             <if test="xmjd != null  and xmjd != ''"> and xmjd = #{xmjd}</if>
             <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
             <if test="shyj != null  and shyj != ''"> and shyj = #{shyj}</if>
             <if test="shsj != null  and shsj != ''"> and shsj = #{shsj}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectZsyzShyjById" parameterType="Long" resultMap="ZsyzShyjResult">
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="xmId != null">xm_id,</if>
             <if test="xmbh != null">xmbh,</if>
-            <if test="shrId != null">shr_id,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="shrxm != null and shrxm != ''">shrxm,</if>
             <if test="xmjd != null and xmjd != ''">xmjd,</if>
             <if test="shjg != null and shjg != ''">shjg,</if>
@@ -64,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
             <if test="xmbh != null">#{xmbh},</if>
-            <if test="shrId != null">#{shrId},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="shrxm != null and shrxm != ''">#{shrxm},</if>
             <if test="xmjd != null and xmjd != ''">#{xmjd},</if>
             <if test="shjg != null and shjg != ''">#{shjg},</if>
@@ -83,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="xmId != null">xm_id = #{xmId},</if>
             <if test="xmbh != null">xmbh = #{xmbh},</if>
-            <if test="shrId != null">shr_id = #{shrId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="shrxm != null and shrxm != ''">shrxm = #{shrxm},</if>
             <if test="xmjd != null and xmjd != ''">xmjd = #{xmjd},</if>
             <if test="shjg != null and shjg != ''">shjg = #{shjg},</if>

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

@@ -0,0 +1,160 @@
+<?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.ZsyzSkxmMapper">
+
+    <resultMap type="ZsyzSkxm" id="ZsyzSkxmResult">
+        <result property="id" column="id"/>
+        <result property="xmmc" column="xmmc"/>
+        <result property="pzwh" column="pzwh"/>
+        <result property="tzdw" column="tzdw"/>
+        <result property="xmszd" column="xmszd"/>
+        <result property="sscy" column="sscy"/>
+        <result property="ztze" column="ztze"/>
+        <result property="swzj" column="swzj"/>
+        <result property="sjdz" column="sjdz"/>
+        <result property="dydw" column="dydw"/>
+        <result property="rkTime" column="rk_time"/>
+        <result property="qytbTime" column="qytb_time"/>
+        <result property="isHs" column="is_hs"/>
+        <result property="jsjd" column="jsjd"/>
+        <result property="isSh" column="is_sh"/>
+        <result property="shName" column="sh_name"/>
+        <result property="shTime" column="sh_time"/>
+        <result property="shJy" column="sh_jy"/>
+        <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="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
+    </sql>
+
+    <select id="selectZsyzSkxmList" parameterType="ZsyzSkxm" resultMap="ZsyzSkxmResult">
+        <include refid="selectZsyzSkxmVo"/>
+        <where>
+            <if test="xmmc != null  and xmmc != ''">and xmmc = #{xmmc}</if>
+            <if test="pzwh != null  and pzwh != ''">and pzwh = #{pzwh}</if>
+            <if test="tzdw != null  and tzdw != ''">and tzdw = #{tzdw}</if>
+            <if test="xmszd != null  and xmszd != ''">and xmszd = #{xmszd}</if>
+            <if test="sscy != null  and sscy != ''">and sscy = #{sscy}</if>
+            <if test="ztze != null  and ztze != ''">and ztze = #{ztze}</if>
+            <if test="swzj != null  and swzj != ''">and swzj = #{swzj}</if>
+            <if test="sjdz != null  and sjdz != ''">and sjdz = #{sjdz}</if>
+            <if test="dydw != null  and dydw != ''">and dydw = #{dydw}</if>
+            <if test="rkTime != null ">and rk_time = #{rkTime}</if>
+            <if test="qytbTime != null ">and qytb_time = #{qytbTime}</if>
+            <if test="isHs != null  and isHs != ''">and is_hs = #{isHs}</if>
+            <if test="jsjd != null  and jsjd != ''">and jsjd = #{jsjd}</if>
+            <if test="isSh != null  and isSh != ''">and is_sh = #{isSh}</if>
+            <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>
+        </where>
+    </select>
+
+    <select id="selectZsyzSkxmById" parameterType="Long" resultMap="ZsyzSkxmResult">
+        <include refid="selectZsyzSkxmVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertZsyzSkxm" parameterType="ZsyzSkxm" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_skxm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmmc != null">xmmc,</if>
+            <if test="pzwh != null">pzwh,</if>
+            <if test="tzdw != null">tzdw,</if>
+            <if test="xmszd != null">xmszd,</if>
+            <if test="sscy != null">sscy,</if>
+            <if test="ztze != null">ztze,</if>
+            <if test="swzj != null">swzj,</if>
+            <if test="sjdz != null and sjdz != ''">sjdz,</if>
+            <if test="dydw != null and dydw != ''">dydw,</if>
+            <if test="rkTime != null">rk_time,</if>
+            <if test="qytbTime != null">qytb_time,</if>
+            <if test="isHs != null and isHs != ''">is_hs,</if>
+            <if test="jsjd != null">jsjd,</if>
+            <if test="isSh != null">is_sh,</if>
+            <if test="shName != null">sh_name,</if>
+            <if test="shTime != null">sh_time,</if>
+            <if test="shJy != null">sh_jy,</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="xmmc != null">#{xmmc},</if>
+            <if test="pzwh != null">#{pzwh},</if>
+            <if test="tzdw != null">#{tzdw},</if>
+            <if test="xmszd != null">#{xmszd},</if>
+            <if test="sscy != null">#{sscy},</if>
+            <if test="ztze != null">#{ztze},</if>
+            <if test="swzj != null">#{swzj},</if>
+            <if test="sjdz != null and sjdz != ''">#{sjdz},</if>
+            <if test="dydw != null and dydw != ''">#{dydw},</if>
+            <if test="rkTime != null">#{rkTime},</if>
+            <if test="qytbTime != null">#{qytbTime},</if>
+            <if test="isHs != null and isHs != ''">#{isHs},</if>
+            <if test="jsjd != null">#{jsjd},</if>
+            <if test="isSh != null">#{isSh},</if>
+            <if test="shName != null">#{shName},</if>
+            <if test="shTime != null">#{shTime},</if>
+            <if test="shJy != null">#{shJy},</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="updateZsyzSkxm" parameterType="ZsyzSkxm">
+        update zsyz_skxm
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmmc != null">xmmc = #{xmmc},</if>
+            <if test="pzwh != null">pzwh = #{pzwh},</if>
+            <if test="tzdw != null">tzdw = #{tzdw},</if>
+            <if test="xmszd != null">xmszd = #{xmszd},</if>
+            <if test="sscy != null">sscy = #{sscy},</if>
+            <if test="ztze != null">ztze = #{ztze},</if>
+            <if test="swzj != null">swzj = #{swzj},</if>
+            <if test="sjdz != null and sjdz != ''">sjdz = #{sjdz},</if>
+            <if test="dydw != null and dydw != ''">dydw = #{dydw},</if>
+            <if test="rkTime != null">rk_time = #{rkTime},</if>
+            <if test="qytbTime != null">qytb_time = #{qytbTime},</if>
+            <if test="isHs != null and isHs != ''">is_hs = #{isHs},</if>
+            <if test="jsjd != null">jsjd = #{jsjd},</if>
+            <if test="isSh != null">is_sh = #{isSh},</if>
+            <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="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>
+    <update id="updateZsyzSkxmSh" parameterType="ZsyzSkxm">
+        update zsyz_skxm set is_sh = #{isSh} ,sh_time = sysdate()
+        where id = #{id}
+    </update>
+
+    <delete id="deleteZsyzSkxmById" parameterType="Long">
+        delete from zsyz_skxm where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzSkxmByIds" parameterType="String">
+        delete from zsyz_skxm where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>