领导批示

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

@@ -0,0 +1,109 @@
+package com.ruoyi.web.controller.projectV2;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
+import com.ruoyi.system.service.projectV2.IZsyzLdpsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 招商引资_领导批示Controller
+ * 
+ * @author ruoyi
+ * @date 2023-02-26
+ */
+@RestController
+@RequestMapping("/projectV2/ldps")
+public class ZsyzLdpsController extends BaseController
+{
+    @Autowired
+    private IZsyzLdpsService zsyzLdpsService;
+
+    /**
+     * 查询招商引资_领导批示列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ldps:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZsyzLdps zsyzLdps)
+    {
+        startPage();
+        List<ZsyzLdps> list = zsyzLdpsService.selectZsyzLdpsList(zsyzLdps);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出招商引资_领导批示列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:ldps:export')")
+    @Log(title = "招商引资_领导批示", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZsyzLdps zsyzLdps)
+    {
+        List<ZsyzLdps> list = zsyzLdpsService.selectZsyzLdpsList(zsyzLdps);
+        ExcelUtil<ZsyzLdps> util = new ExcelUtil<ZsyzLdps>(ZsyzLdps.class);
+        util.exportExcel(response, list, "招商引资_领导批示数据");
+    }
+
+    /**
+     * 获取招商引资_领导批示详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:ldps:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zsyzLdpsService.selectZsyzLdpsById(id));
+    }
+
+    /**
+     * 新增招商引资_领导批示
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody ZsyzLdps zsyzLdps)
+    {
+        return toAjax(zsyzLdpsService.insertZsyzLdps(zsyzLdps));
+    }
+
+    /**
+     * 修改招商引资_领导批示
+     */
+    @Log(title = "招商引资_领导批示", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZsyzLdps zsyzLdps)
+    {
+        return toAjax(zsyzLdpsService.updateZsyzLdps(zsyzLdps));
+    }
+
+    /**
+     * 删除招商引资_领导批示
+     */
+    @Log(title = "招商引资_领导批示", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zsyzLdpsService.deleteZsyzLdpsByIds(ids));
+    }
+
+    /**
+     * 删除招商引资_领导批示
+     */
+    @GetMapping("delete")
+    public AjaxResult remove(Long id)
+    {
+        return toAjax(zsyzLdpsService.deleteZsyzLdpsById(id));
+    }
+}

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

@@ -39,6 +39,17 @@ public class ZsyzSbbzbController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 领导批示列表
+     */
+    @GetMapping("/ldps/list")
+    public TableDataInfo ldpsList(ZsyzSbbzb zsyzSbbzb)
+    {
+        startPage();
+        List<ZsyzSbbzb> list = zsyzSbbzbService.ldpsList(zsyzSbbzb);
+        return getDataTable(list);
+    }
+
     /**
      * 导出招商引资_申报_首谈信息_主列表
      */

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

@@ -0,0 +1,210 @@
+package com.ruoyi.system.domain.projectV2;
+
+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;
+
+import java.util.Date;
+
+/**
+ * 招商引资_领导批示对象 zsyz_ldps
+ * 
+ * @author ruoyi
+ * @date 2023-02-26
+ */
+public class ZsyzLdps extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    private Long ids;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private Long xmId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String xmbh;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String xmmc;
+
+
+    /** 目标数据id（审核表id） */
+    @Excel(name = "目标数据id", readConverterExp = "审=核表id")
+    private Long sourceId;
+
+    /** 批示内容 */
+    @Excel(name = "批示内容")
+    private String psnr;
+
+    /** 暂存批示内容 */
+    @Excel(name = "暂存批示内容")
+    private String zcpsnr;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+
+    /** 创建者 */
+    private String psr;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cjsj;
+
+    /** 更新者 */
+    private String xgr;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xgsj;
+
+
+    /** 暂存还是保存 (1:暂存，2：保存)*/
+    private String type;
+
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getIds() {
+        return ids;
+    }
+
+    public void setIds(Long ids) {
+        this.ids = ids;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setXmId(Long xmId) 
+    {
+        this.xmId = xmId;
+    }
+
+    public Long getXmId() 
+    {
+        return xmId;
+    }
+    public void setXmbh(String xmbh) 
+    {
+        this.xmbh = xmbh;
+    }
+
+    public String getXmbh() 
+    {
+        return xmbh;
+    }
+    public void setSourceId(Long sourceId) 
+    {
+        this.sourceId = sourceId;
+    }
+
+    public Long getSourceId() 
+    {
+        return sourceId;
+    }
+    public void setPsnr(String psnr) 
+    {
+        this.psnr = psnr;
+    }
+
+    public String getPsnr() 
+    {
+        return psnr;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getZcpsnr() {
+        return zcpsnr;
+    }
+
+    public String getPsr() {
+        return psr;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public String getXgr() {
+        return xgr;
+    }
+
+    public Date getXgsj() {
+        return xgsj;
+    }
+
+    public void setZcpsnr(String zcpsnr) {
+        this.zcpsnr = zcpsnr;
+    }
+
+    public void setPsr(String psr) {
+        this.psr = psr;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public void setXgr(String xgr) {
+        this.xgr = xgr;
+    }
+
+    public void setXgsj(Date xgsj) {
+        this.xgsj = xgsj;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xmId", getXmId())
+            .append("xmbh", getXmbh())
+            .append("sourceId", getSourceId())
+            .append("psnr", getPsnr())
+            .append("remark", getRemark())
+            .append("deptId", getDeptId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.xml.crypto.Data;
+import java.util.List;
 
 /**
  * 招商引资_审核意见对象 zsyz_shyj
@@ -59,6 +60,12 @@ public class ZsyzShyj extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String shsj;
 
+    /**
+     * 审核意见列表
+     */
+    private List<ZsyzLdps> zsyzLdpsList;
+
+
     public String getXmmc() {
         return xmmc;
     }
@@ -148,6 +155,14 @@ public class ZsyzShyj extends BaseEntity
         this.shsj = shsj;
     }
 
+    public List<ZsyzLdps> getZsyzLdpsList() {
+        return zsyzLdpsList;
+    }
+
+    public void setZsyzLdpsList(List<ZsyzLdps> zsyzLdpsList) {
+        this.zsyzLdpsList = zsyzLdpsList;
+    }
+
     @Override
     public String toString() {
         return "ZsyzShyj{" +

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

@@ -264,6 +264,7 @@ public class ZsyzSkxm extends BaseEntity
         return shJy;
     }
 
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
+
+/**
+ * 招商引资_领导批示Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-26
+ */
+public interface ZsyzLdpsMapper 
+{
+    /**
+     * 查询招商引资_领导批示
+     * 
+     * @param id 招商引资_领导批示主键
+     * @return 招商引资_领导批示
+     */
+    public ZsyzLdps selectZsyzLdpsById(Long id);
+
+    /**
+     * 查询招商引资_领导批示列表
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 招商引资_领导批示集合
+     */
+    public List<ZsyzLdps> selectZsyzLdpsList(ZsyzLdps zsyzLdps);
+
+    /**
+     * 新增招商引资_领导批示
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 结果
+     */
+    public int insertZsyzLdps(ZsyzLdps zsyzLdps);
+
+    /**
+     * 修改招商引资_领导批示
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 结果
+     */
+    public int updateZsyzLdps(ZsyzLdps zsyzLdps);
+
+    /**
+     * 删除招商引资_领导批示
+     * 
+     * @param id 招商引资_领导批示主键
+     * @return 结果
+     */
+    public int deleteZsyzLdpsById(Long id);
+
+    /**
+     * 批量删除招商引资_领导批示
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZsyzLdpsByIds(Long[] ids);
+}

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

@@ -73,4 +73,6 @@ public interface ZsyzSbbzbMapper
     public int deleteZsyzSbbzbByIds(Long[] ids);
 
     List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb);
+
+    List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
 }

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

@@ -0,0 +1,109 @@
+package com.ruoyi.system.service.impl.projectV2;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.projectV2.ZsyzLdpsMapper;
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
+import com.ruoyi.system.service.projectV2.IZsyzLdpsService;
+
+/**
+ * 招商引资_领导批示Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-02-26
+ */
+@Service
+public class ZsyzLdpsServiceImpl implements IZsyzLdpsService 
+{
+    @Autowired
+    private ZsyzLdpsMapper zsyzLdpsMapper;
+
+    /**
+     * 查询招商引资_领导批示
+     * 
+     * @param id 招商引资_领导批示主键
+     * @return 招商引资_领导批示
+     */
+    @Override
+    public ZsyzLdps selectZsyzLdpsById(Long id)
+    {
+        return zsyzLdpsMapper.selectZsyzLdpsById(id);
+    }
+
+    /**
+     * 查询招商引资_领导批示列表
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 招商引资_领导批示
+     */
+    @Override
+    public List<ZsyzLdps> selectZsyzLdpsList(ZsyzLdps zsyzLdps)
+    {
+        return zsyzLdpsMapper.selectZsyzLdpsList(zsyzLdps);
+    }
+
+    /**
+     * 新增招商引资_领导批示
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 结果
+     */
+    @Override
+    public int insertZsyzLdps(ZsyzLdps zsyzLdps)
+    {
+        //获取当前人员信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        zsyzLdps.setDeptId(user.getDeptId());
+        zsyzLdps.setPsr(user.getUserName());
+        zsyzLdps.setCjsj(DateUtils.getNowDate());
+        return zsyzLdpsMapper.insertZsyzLdps(zsyzLdps);
+    }
+
+    /**
+     * 修改招商引资_领导批示
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 结果
+     */
+    @Override
+    public int updateZsyzLdps(ZsyzLdps zsyzLdps)
+    {
+        //获取当前人员信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        zsyzLdps.setXgsj(DateUtils.getNowDate());
+        zsyzLdps.setXgr(user.getUserName());
+        if(!"1".equals(zsyzLdps.getType())){
+            zsyzLdps.setZcpsnr("");
+        }
+        return zsyzLdpsMapper.updateZsyzLdps(zsyzLdps);
+    }
+
+    /**
+     * 批量删除招商引资_领导批示
+     * 
+     * @param ids 需要删除的招商引资_领导批示主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzLdpsByIds(Long[] ids)
+    {
+        return zsyzLdpsMapper.deleteZsyzLdpsByIds(ids);
+    }
+
+    /**
+     * 删除招商引资_领导批示信息
+     * 
+     * @param id 招商引资_领导批示主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZsyzLdpsById(Long id)
+    {
+        return zsyzLdpsMapper.deleteZsyzLdpsById(id);
+    }
+}

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

@@ -14,13 +14,12 @@ import java.util.List;
 
 /**
  * 招商引资_签约信息Service业务层处理
- * 
+ *
  * @author boman
  * @date 2023-02-22
  */
 @Service
-public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
-{
+public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
     @Autowired
     private ZsyzQyxxMapper zsyzQyxxMapper;
 
@@ -29,46 +28,45 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
 
     /**
      * 查询招商引资_签约信息
-     * 
+     *
      * @param id 招商引资_签约信息ID
      * @return 招商引资_签约信息
      */
     @Override
     @Transactional
-    public ZsyzQyxx selectZsyzQyxxById(Long id)
-    {
+    public ZsyzQyxx selectZsyzQyxxById(Long id) {
         ZsyzQyxx zsyzQyxx = zsyzQyxxMapper.selectZsyzQyxxById(id);
-        ZsyzFj zsyzFj = new ZsyzFj();
-        zsyzFj.setSourceId(id);
-        List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
-        if (zsyzFjList != null && zsyzFjList.size() > 0){
-            zsyzQyxx.setZsyzFjList(zsyzFjList);
+        if (zsyzQyxx != null) {
+            ZsyzFj zsyzFj = new ZsyzFj();
+            zsyzFj.setSourceId(id);
+            List<ZsyzFj> zsyzFjList = zsyzFjMapper.selectZsyzFjList(zsyzFj);
+            if (zsyzFjList != null && zsyzFjList.size() > 0) {
+                zsyzQyxx.setZsyzFjList(zsyzFjList);
+            }
         }
         return zsyzQyxx;
     }
 
     /**
      * 查询招商引资_签约信息列表
-     * 
+     *
      * @param zsyzQyxx 招商引资_签约信息
      * @return 招商引资_签约信息
      */
     @Override
-    public List<ZsyzQyxx> selectZsyzQyxxList(ZsyzQyxx zsyzQyxx)
-    {
+    public List<ZsyzQyxx> selectZsyzQyxxList(ZsyzQyxx zsyzQyxx) {
         return zsyzQyxxMapper.selectZsyzQyxxList(zsyzQyxx);
     }
 
     /**
      * 新增招商引资_签约信息
-     * 
+     *
      * @param zsyzQyxx 招商引资_签约信息
      * @return 结果
      */
     @Override
     @Transactional
-    public int insertZsyzQyxx(ZsyzQyxx zsyzQyxx)
-    {
+    public int insertZsyzQyxx(ZsyzQyxx zsyzQyxx) {
 
         zsyzQyxx.setCreateTime(DateUtils.getNowDate());
         int count = zsyzQyxxMapper.insertZsyzQyxx(zsyzQyxx);
@@ -87,19 +85,18 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
 
     /**
      * 修改招商引资_签约信息
-     * 
+     *
      * @param zsyzQyxx 招商引资_签约信息
      * @return 结果
      */
     @Override
     @Transactional
-    public int updateZsyzQyxx(ZsyzQyxx zsyzQyxx)
-    {
+    public int updateZsyzQyxx(ZsyzQyxx zsyzQyxx) {
 
         zsyzQyxx.setUpdateTime(DateUtils.getNowDate());
         int count = zsyzQyxxMapper.updateZsyzQyxx(zsyzQyxx);
         //修改附件
-        if(zsyzQyxx.getZsyzFjList()!=null && zsyzQyxx.getZsyzFjList().size()>0){
+        if (zsyzQyxx.getZsyzFjList() != null && zsyzQyxx.getZsyzFjList().size() > 0) {
             //先删除相关附件
             zsyzFjMapper.deleteZsyzFjBySourceId(zsyzQyxx.getId());
             //再将文件新增进数据库
@@ -117,25 +114,23 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService
 
     /**
      * 批量删除招商引资_签约信息
-     * 
+     *
      * @param ids 需要删除的招商引资_签约信息ID
      * @return 结果
      */
     @Override
-    public int deleteZsyzQyxxByIds(Long[] ids)
-    {
+    public int deleteZsyzQyxxByIds(Long[] ids) {
         return zsyzQyxxMapper.deleteZsyzQyxxByIds(ids);
     }
 
     /**
      * 删除招商引资_签约信息信息
-     * 
+     *
      * @param id 招商引资_签约信息ID
      * @return 结果
      */
     @Override
-    public int deleteZsyzQyxxById(Long id)
-    {
+    public int deleteZsyzQyxxById(Long id) {
         return zsyzQyxxMapper.deleteZsyzQyxxById(id);
     }
 }

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

@@ -175,4 +175,10 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     public List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb) {
         return zsyzSbbzbMapper.selectZsyzSbbzbListDc(zsyzSbbzb);
     }
+
+    @Override
+    public List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb) {
+
+        return zsyzSbbzbMapper.ldpsList(zsyzSbbzb);
+    }
 }

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

@@ -64,6 +64,7 @@ public class ZsyzShyjServiceImpl implements IZsyzShyjService
         zsyzShyj.setDeptId(dept.getDeptId());
         zsyzShyj.setShrxm(dept.getDeptName());
         zsyzShyj.setCreateTime(DateUtils.getNowDate());
+        zsyzShyj.setShsj(DateUtils.getTime());
         return zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
     }
 

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

@@ -89,6 +89,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         //先去redis 中查询
         Map<String, Integer> map = redisCache.getCacheObject(INDEX);
         if (map == null) {
+            map = new HashMap<>();
             //定义返回值
             int sk = 0;
             SysUser currentUser = SecurityUtils.getLoginUser().getUser();

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.projectV2;
+
+import java.util.List;
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
+
+/**
+ * 招商引资_领导批示Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-02-26
+ */
+public interface IZsyzLdpsService 
+{
+    /**
+     * 查询招商引资_领导批示
+     * 
+     * @param id 招商引资_领导批示主键
+     * @return 招商引资_领导批示
+     */
+    public ZsyzLdps selectZsyzLdpsById(Long id);
+
+    /**
+     * 查询招商引资_领导批示列表
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 招商引资_领导批示集合
+     */
+    public List<ZsyzLdps> selectZsyzLdpsList(ZsyzLdps zsyzLdps);
+
+    /**
+     * 新增招商引资_领导批示
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 结果
+     */
+    public int insertZsyzLdps(ZsyzLdps zsyzLdps);
+
+    /**
+     * 修改招商引资_领导批示
+     * 
+     * @param zsyzLdps 招商引资_领导批示
+     * @return 结果
+     */
+    public int updateZsyzLdps(ZsyzLdps zsyzLdps);
+
+    /**
+     * 批量删除招商引资_领导批示
+     * 
+     * @param ids 需要删除的招商引资_领导批示主键集合
+     * @return 结果
+     */
+    public int deleteZsyzLdpsByIds(Long[] ids);
+
+    /**
+     * 删除招商引资_领导批示信息
+     * 
+     * @param id 招商引资_领导批示主键
+     * @return 结果
+     */
+    public int deleteZsyzLdpsById(Long id);
+}

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

@@ -67,4 +67,6 @@ public interface IZsyzSbbzbService
     public int deleteZsyzSbbzbById(Long id);
 
     List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb);
+
+    List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
 }

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

@@ -0,0 +1,103 @@
+<?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.ZsyzLdpsMapper">
+
+    <resultMap type="ZsyzLdps" id="ZsyzLdpsResult">
+        <result property="ids"    column="ids"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="sourceId"    column="source_id"    />
+        <result property="psnr"    column="psnr"    />
+        <result property="remark"    column="remark"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="psr"    column="psr"    />
+        <result property="cjsj"    column="cjsj"    />
+        <result property="xgr"    column="xgr"    />
+        <result property="xgsj"    column="xgsj"    />
+    </resultMap>
+
+    <sql id="selectZsyzLdpsVo">
+        select id, xm_id, xmbh,xmmc, source_id, psnr,zcpsnr, remark, dept_id, psr, cjsj, xgr, xgsj from zsyz_ldps
+    </sql>
+
+    <select id="selectZsyzLdpsList" parameterType="ZsyzLdps" resultMap="ZsyzLdpsResult">
+        <include refid="selectZsyzLdpsVo"/>
+        <where>  
+            <if test="xmId != null "> and xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="sourceId != null "> and source_id = #{sourceId}</if>
+            <if test="psnr != null  and psnr != ''"> and psnr = #{psnr}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+        </where>
+    </select>
+    
+    <select id="selectZsyzLdpsById" parameterType="Long" resultMap="ZsyzLdpsResult">
+        <include refid="selectZsyzLdpsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZsyzLdps" parameterType="ZsyzLdps" useGeneratedKeys="true" keyProperty="id">
+        insert into zsyz_ldps
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">xm_id,</if>
+            <if test="xmbh != null">xmbh,</if>
+            <if test="xmmc != null">xmmc,</if>
+            <if test="sourceId != null">source_id,</if>
+            <if test="psnr != null">psnr,</if>
+            <if test="zcpsnr != null">zcpsnr,</if>
+            <if test="remark != null">remark,</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>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="xmId != null">#{xmId},</if>
+            <if test="xmbh != null">#{xmbh},</if>
+            <if test="xmmc != null">#{xmmc},</if>
+            <if test="sourceId != null">#{sourceId},</if>
+            <if test="psnr != null">#{psnr},</if>
+            <if test="zcpsnr != null">#{zcpsnr},</if>
+            <if test="remark != null">#{remark},</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>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZsyzLdps" parameterType="ZsyzLdps">
+        update zsyz_ldps
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="xmId != null">xm_id = #{xmId},</if>
+            <if test="xmbh != null">xmbh = #{xmbh},</if>
+            <if test="xmmc != null">xmmc = #{xmmc},</if>
+            <if test="sourceId != null">source_id = #{sourceId},</if>
+            <if test="psnr != null">psnr = #{psnr},</if>
+            <if test="zcpsnr != null">zcpsnr = #{zcpsnr},</if>
+            <if test="remark != null">remark = #{remark},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteZsyzLdpsById" parameterType="Long">
+        delete from zsyz_ldps where id = #{id}
+    </delete>
+
+    <delete id="deleteZsyzLdpsByIds" parameterType="String">
+        delete from zsyz_ldps where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -328,6 +328,71 @@
       where  s.is_del = 'N'
       and (d.dept_id = #{deptId} or s.depe_id = #{deptId})
     </select>
+    <select id="ldpsList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
+        select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
+        s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
+        s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
+        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
+        left join zsyz_ldps l on l.source_id = j.id
+        <where>
+            s.is_del = 'N' and l.psnr is not null
+            <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>
 
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_sbbzb

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

@@ -20,31 +20,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+
+        <collection property="zsyzLdpsList" javaType="java.util.List" resultMap="ZsyzLdpsResult"/>
+    </resultMap>
+
+
+    <resultMap type="ZsyzLdps" id="ZsyzLdpsResult">
+        <result property="ids"    column="ids"    />
+        <result property="xmId"    column="xm_id"    />
+        <result property="xmbh"    column="xmbh"    />
+        <result property="xmmc"    column="xmmc"    />
+        <result property="sourceId"    column="source_id"    />
+        <result property="psnr"    column="psnr"    />
+        <result property="zcpsnr"    column="zcpsnr"    />
+        <result property="remark"    column="remark"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="psr"    column="psr"    />
+        <result property="cjsj"    column="cjsj"    />
+        <result property="xgr"    column="xgr"    />
+        <result property="xgsj"    column="xgsj"    />
     </resultMap>
 
     <sql id="selectZsyzShyjVo">
-        select id, xm_id, xmbh, dept_id, shrxm, xmjd,xmmc, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zsyz_shyj
+        select s.id, s.xm_id, s.xmbh, s.dept_id, s.shrxm, s.xmjd,s.xmmc, s.shjg, s.shyj, s.shsj, s.create_by, s.create_time, s.update_by, s.update_time, s.remark ,
+               l.id as ids, l.xm_id, l.xmbh, l.xmmc, l.source_id, l.psnr, l.zcpsnr, l.remark, l.dept_id, l.psr, l.cjsj, l.xgr, l.xgsj
+        from zsyz_shyj s
+        left join   zsyz_ldps l on s.id = l.source_id
+
     </sql>
 
     <select id="selectZsyzShyjList" parameterType="ZsyzShyj" resultMap="ZsyzShyjResult">
         <include refid="selectZsyzShyjVo"/>
         <where>  
-            <if test="xmId != null "> and xm_id = #{xmId}</if>
-            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
-            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</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 = #{shsj}</if>
+            <if test="xmId != null "> and s.xm_id = #{xmId}</if>
+            <if test="xmbh != null  and xmbh != ''"> and s.xmbh = #{xmbh}</if>
+            <if test="xmmc != null  and xmmc != ''"> and s.xmmc = #{xmmc}</if>
+            <if test="shrxm != null  and shrxm != ''"> and s.shrxm = #{shrxm}</if>
+            <if test="xmjd != null  and xmjd != ''"> and s.xmjd = #{xmjd}</if>
+            <if test="shjg != null  and shjg != ''"> and s.shjg = #{shjg}</if>
+            <if test="shyj != null  and shyj != ''"> and s.shyj = #{shyj}</if>
+            <if test="shsj != null "> and s.shsj = #{shsj}</if>
         </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        order by s.shsj desc
     </select>
     
     <select id="selectZsyzShyjById" parameterType="Long" resultMap="ZsyzShyjResult">
         <include refid="selectZsyzShyjVo"/>
-        where id = #{id}
+        where l.id = #{id}
     </select>
         
     <insert id="insertZsyzShyj" parameterType="ZsyzShyj" useGeneratedKeys="true" keyProperty="id">