督办节点

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwDbdController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.fgw;
+
+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.fgw.FgwDbd;
+import com.ruoyi.system.service.fgw.IFgwDbdService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 发改委_督办单Controller
+ * 
+ * @author ruoyi
+ * @date 2023-03-24
+ */
+@RestController
+@RequestMapping("/fgw/dbd")
+public class FgwDbdController extends BaseController
+{
+    @Autowired
+    private IFgwDbdService fgwDbdService;
+
+    /**
+     * 查询发改委_督办单列表
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dbd:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FgwDbd fgwDbd)
+    {
+        startPage();
+        List<FgwDbd> list = fgwDbdService.selectFgwDbdList(fgwDbd);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出发改委_督办单列表
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dbd:export')")
+    @Log(title = "发改委_督办单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FgwDbd fgwDbd)
+    {
+        List<FgwDbd> list = fgwDbdService.selectFgwDbdList(fgwDbd);
+        ExcelUtil<FgwDbd> util = new ExcelUtil<FgwDbd>(FgwDbd.class);
+        util.exportExcel(response, list, "发改委_督办单数据");
+    }
+
+    /**
+     * 获取发改委_督办单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dbd:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(fgwDbdService.selectFgwDbdById(id));
+    }
+
+    /**
+     * 新增发改委_督办单
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dbd:add')")
+    @Log(title = "发改委_督办单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FgwDbd fgwDbd)
+    {
+        return fgwDbdService.insertFgwDbd(fgwDbd);
+    }
+
+    /**
+     * 修改发改委_督办单
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dbd:edit')")
+    @Log(title = "发改委_督办单", businessType = BusinessType.UPDATE)
+    @PostMapping("put")
+    public AjaxResult edit(@RequestBody FgwDbd fgwDbd)
+    {
+        return toAjax(fgwDbdService.updateFgwDbd(fgwDbd));
+    }
+
+    /**
+     * 删除发改委_督办单
+     */
+    @PreAuthorize("@ss.hasPermi('fgw:dbd:remove')")
+    @Log(title = "发改委_督办单", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(fgwDbdService.deleteFgwDbdByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fgw/FgwXmsbController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.fgw.FgwXmsb;
+import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.service.fgw.IFgwXmsbService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,18 @@ public class FgwXmsbController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 领导批示列表
+     */
+    @GetMapping("/ldps/list")
+    @PreAuthorize("@ss.hasPermi('fgw:xmsb:ldps:list')")
+    public TableDataInfo ldpsList(FgwXmsb fgwXmsb)
+    {
+        startPage();
+        List<FgwXmsb> list = fgwXmsbService.ldpsList(fgwXmsb);
+        return getDataTable(list);
+    }
+
     /**
      * 导出发改委_申报_主列表
      */

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzSbbzbServiceImpl.java

@@ -314,6 +314,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
     }
 
     @Override
+    @DataScope(deptAlias = "s",permission = "s.cjd_id")
     public List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb) {
 
         List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();

ruoyi-system/src/main/java/com/ruoyi/system/domain/fgw/FgwDbd.java

@@ -0,0 +1,225 @@
+package com.ruoyi.system.domain.fgw;
+
+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;
+
+/**
+ * 发改委_督办单对象 fgw_dbd
+ * 
+ * @author ruoyi
+ * @date 2023-03-24
+ */
+public class FgwDbd 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;
+
+    /** 督办内容编号 */
+    @Excel(name = "督办内容编号")
+    private Long dbnrId;
+
+    /** 督办内容名称 */
+    @Excel(name = "督办内容名称")
+    private String dbnrName;
+
+    /** 督办部门id */
+    @Excel(name = "督办部门id")
+    private Long deptId;
+
+    /** 督办部门名称 */
+    @Excel(name = "督办部门名称")
+    private String deptName;
+
+    /** 督办等级 */
+    @Excel(name = "督办等级")
+    private String dbdj;
+
+    /** 要求完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date yqwcsj;
+
+    /** 超期天数 */
+    @Excel(name = "超期天数")
+    private Long cqts;
+
+    /** 是否完成 N:未完成，2:已完成 */
+    @Excel(name = "是否完成 N:未完成，Y:已完成")
+    private String isWc;
+
+    /** 超期等级 0：未超期 1：黄牌，2红牌 */
+    @Excel(name = "超期等级")
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    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 setDbnrId(Long dbnrId) 
+    {
+        this.dbnrId = dbnrId;
+    }
+
+    public Long getDbnrId() 
+    {
+        return dbnrId;
+    }
+    public void setDbnrName(String dbnrName) 
+    {
+        this.dbnrName = dbnrName;
+    }
+
+    public String getDbnrName() 
+    {
+        return dbnrName;
+    }
+    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 setDbdj(String dbdj) 
+    {
+        this.dbdj = dbdj;
+    }
+
+    public String getDbdj() 
+    {
+        return dbdj;
+    }
+    public void setYqwcsj(Date yqwcsj) 
+    {
+        this.yqwcsj = yqwcsj;
+    }
+
+    public Date getYqwcsj() 
+    {
+        return yqwcsj;
+    }
+    public void setCqts(Long cqts) 
+    {
+        this.cqts = cqts;
+    }
+
+    public Long getCqts() 
+    {
+        return cqts;
+    }
+    public void setIsWc(String isWc) 
+    {
+        this.isWc = isWc;
+    }
+
+    public String getIsWc() 
+    {
+        return isWc;
+    }
+
+    @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("dbnrId", getDbnrId())
+            .append("dbnrName", getDbnrName())
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("dbdj", getDbdj())
+            .append("yqwcsj", getYqwcsj())
+            .append("cqts", getCqts())
+            .append("isWc", getIsWc())
+            .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/fgw/FgwDbdMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper.fgw;
+
+import java.util.List;
+import com.ruoyi.system.domain.fgw.FgwDbd;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 发改委_督办单Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-24
+ */
+public interface FgwDbdMapper 
+{
+    /**
+     * 查询发改委_督办单
+     * 
+     * @param id 发改委_督办单主键
+     * @return 发改委_督办单
+     */
+    public FgwDbd selectFgwDbdById(Long id);
+
+    /**
+     * 查询发改委_督办单列表
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 发改委_督办单集合
+     */
+    public List<FgwDbd> selectFgwDbdList(FgwDbd fgwDbd);
+
+    /**
+     * 新增发改委_督办单
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 结果
+     */
+    public int insertFgwDbd(FgwDbd fgwDbd);
+
+    /**
+     * 修改发改委_督办单
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 结果
+     */
+    public int updateFgwDbd(FgwDbd fgwDbd);
+
+    /**
+     * 删除发改委_督办单
+     * 
+     * @param id 发改委_督办单主键
+     * @return 结果
+     */
+    public int deleteFgwDbdById(Long id);
+
+    /**
+     * 批量删除发改委_督办单
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFgwDbdByIds(Long[] ids);
+
+    void updateFgwDbdByDbnrId(@Param("xmId") Long id, @Param("type")String type);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwLdpsMapper.java

@@ -59,5 +59,5 @@ public interface FgwLdpsMapper
      */
     public int deleteFgwLdpsByIds(Long[] ids);
 
-    String getInfoZc(FgwLdps fgwLdps);
+    FgwLdps getInfoZc(FgwLdps fgwLdps);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwXmsbMapper.java

@@ -67,4 +67,6 @@ public interface FgwXmsbMapper
      * @return 结果
      */
     public int deleteFgwXmsbByIds(Long[] ids);
+
+    List<FgwXmsb> ldpsList(FgwXmsb fgwXmsb);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwDbdService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service.fgw;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.fgw.FgwDbd;
+
+/**
+ * 发改委_督办单Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-03-24
+ */
+public interface IFgwDbdService 
+{
+    /**
+     * 查询发改委_督办单
+     * 
+     * @param id 发改委_督办单主键
+     * @return 发改委_督办单
+     */
+    public FgwDbd selectFgwDbdById(Long id);
+
+    /**
+     * 查询发改委_督办单列表
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 发改委_督办单集合
+     */
+    public List<FgwDbd> selectFgwDbdList(FgwDbd fgwDbd);
+
+    /**
+     * 新增发改委_督办单
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 结果
+     */
+    public AjaxResult insertFgwDbd(FgwDbd fgwDbd);
+
+    /**
+     * 修改发改委_督办单
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 结果
+     */
+    public int updateFgwDbd(FgwDbd fgwDbd);
+
+    /**
+     * 批量删除发改委_督办单
+     * 
+     * @param ids 需要删除的发改委_督办单主键集合
+     * @return 结果
+     */
+    public int deleteFgwDbdByIds(Long[] ids);
+
+    /**
+     * 删除发改委_督办单信息
+     * 
+     * @param id 发改委_督办单主键
+     * @return 结果
+     */
+    public int deleteFgwDbdById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwLdpsService.java

@@ -59,5 +59,5 @@ public interface IFgwLdpsService
      */
     public int deleteFgwLdpsById(Long id);
 
-    String getInfoZc(FgwLdps fgwLdps);
+    FgwLdps getInfoZc(FgwLdps fgwLdps);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/fgw/IFgwXmsbService.java

@@ -61,4 +61,6 @@ public interface IFgwXmsbService
      * @return 结果
      */
     public int deleteFgwXmsbById(Long id);
+
+    List<FgwXmsb> ldpsList(FgwXmsb fgwXmsb);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwDbdServiceImpl.java

@@ -0,0 +1,112 @@
+package com.ruoyi.system.service.impl.fgw;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.fgw.FgwFj;
+import com.ruoyi.system.mapper.fgw.FgwFjMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.fgw.FgwDbdMapper;
+import com.ruoyi.system.domain.fgw.FgwDbd;
+import com.ruoyi.system.service.fgw.IFgwDbdService;
+
+/**
+ * 发改委_督办单Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-03-24
+ */
+@Service
+public class FgwDbdServiceImpl implements IFgwDbdService 
+{
+    @Autowired
+    private FgwDbdMapper fgwDbdMapper;
+    @Autowired
+    private FgwFjMapper fgwFjMapper;
+
+    /**
+     * 查询发改委_督办单
+     * 
+     * @param id 发改委_督办单主键
+     * @return 发改委_督办单
+     */
+    @Override
+    public FgwDbd selectFgwDbdById(Long id)
+    {
+        return fgwDbdMapper.selectFgwDbdById(id);
+    }
+
+    /**
+     * 查询发改委_督办单列表
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 发改委_督办单
+     */
+    @Override
+    public List<FgwDbd> selectFgwDbdList(FgwDbd fgwDbd)
+    {
+        return fgwDbdMapper.selectFgwDbdList(fgwDbd);
+    }
+
+    /**
+     * 新增发改委_督办单
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertFgwDbd(FgwDbd fgwDbd)
+    {
+        //查询督办的附件是否存在，附件存在不生成督办信息
+        FgwFj fgwFj = new FgwFj();
+        fgwFj.setXmId(fgwDbd.getXmId());
+        fgwFj.setType(String.valueOf(fgwDbd.getDbnrId()));
+        List<FgwFj> fgwFjs = fgwFjMapper.selectFgwFjList(fgwFj);
+        if(fgwFjs.size()>0){
+            return AjaxResult.error("当前督办内容附件已上传");
+        }
+
+        fgwDbd.setCreateTime(DateUtils.getNowDate());
+        int i = fgwDbdMapper.insertFgwDbd(fgwDbd);
+        return i > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改发改委_督办单
+     * 
+     * @param fgwDbd 发改委_督办单
+     * @return 结果
+     */
+    @Override
+    public int updateFgwDbd(FgwDbd fgwDbd)
+    {
+        fgwDbd.setUpdateTime(DateUtils.getNowDate());
+        return fgwDbdMapper.updateFgwDbd(fgwDbd);
+    }
+
+    /**
+     * 批量删除发改委_督办单
+     * 
+     * @param ids 需要删除的发改委_督办单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwDbdByIds(Long[] ids)
+    {
+        return fgwDbdMapper.deleteFgwDbdByIds(ids);
+    }
+
+    /**
+     * 删除发改委_督办单信息
+     * 
+     * @param id 发改委_督办单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFgwDbdById(Long id)
+    {
+        return fgwDbdMapper.deleteFgwDbdById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwLdpsServiceImpl.java

@@ -153,7 +153,7 @@ public class FgwLdpsServiceImpl implements IFgwLdpsService
     }
 
     @Override
-    public String getInfoZc(FgwLdps fgwLdps) {
+    public FgwLdps getInfoZc(FgwLdps fgwLdps) {
         //获取当前人员信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         fgwLdps.setPsnrId(user.getUserId());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwXmsbServiceImpl.java

@@ -1,9 +1,13 @@
 package com.ruoyi.system.service.impl.fgw;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.fgw.FgwDbd;
 import com.ruoyi.system.domain.fgw.FgwFj;
 import com.ruoyi.system.domain.fgw.FgwXmsb;
+import com.ruoyi.system.mapper.fgw.FgwDbdMapper;
 import com.ruoyi.system.mapper.fgw.FgwFjMapper;
 import com.ruoyi.system.mapper.fgw.FgwXmsbMapper;
 import com.ruoyi.system.service.fgw.IFgwXmsbService;
@@ -27,6 +31,8 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
     private FgwXmsbMapper fgwXmsbMapper;
     @Autowired
     private FgwFjMapper fgwFjMapper;
+    @Autowired
+    private FgwDbdMapper fgwDbdMapper;
 
     /**
      * 查询发改委_申报_主
@@ -53,6 +59,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
      * @return 发改委_申报_主
      */
     @Override
+    @DataScope
     public List<FgwXmsb> selectFgwXmsbList(FgwXmsb fgwXmsb)
     {
         return fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);
@@ -102,12 +109,17 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
         //修改主表项目进入待审核
         fgwXmsb.setStatus(ONE);
         List<FgwFj> fjList = fgwXmsb.getFjList();
+        //删除之前的
         fgwFjMapper.deleteFgwFjByXmId(fgwXmsb.getId());
         if (fjList != null && fjList.size() > 0){
-            //删除之前的
+            //保存当前的
             for (FgwFj fgwFj : fjList) {
                 fgwFjMapper.insertFgwFj(fgwFj);
+                //修改督办的状态
+                fgwDbdMapper.updateFgwDbdByDbnrId(fgwXmsb.getId(),fgwFj.getType());
+
             }
+
         }
         return fgwXmsbMapper.updateFgwXmsb(fgwXmsb);
     }
@@ -135,4 +147,10 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
     {
         return fgwXmsbMapper.deleteFgwXmsbById(id);
     }
+
+    @Override
+    @DataScope
+    public List<FgwXmsb> ldpsList(FgwXmsb fgwXmsb) {
+        return fgwXmsbMapper.ldpsList(fgwXmsb);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/fgw/FgwDbdMapper.xml

@@ -0,0 +1,195 @@
+<?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.fgw.FgwDbdMapper">
+    
+    <resultMap type="FgwDbd" id="FgwDbdResult">
+        <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="dbnrId"    column="dbnr_id"    />
+        <result property="dbnrName"    column="dbnr_name"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="dbdj"    column="dbdj"    />
+        <result property="yqwcsj"    column="yqwcsj"    />
+        <result property="cqts"    column="cqts"    />
+        <result property="isWc"    column="is_wc"    />
+        <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="type"    column="type"    />
+
+    </resultMap>
+
+    <sql id="selectFgwDbdVo">
+        select id, dh, xm_id, xmbh, xmmc, dbnr_id, dbnr_name, dept_id, dept_name, dbdj, yqwcsj, cqts, is_wc, create_by, create_time, update_by, update_time, remark from fgw_dbd
+    </sql>
+
+    <select id="selectFgwDbdList" parameterType="FgwDbd" resultMap="FgwDbdResult">
+        SELECT
+        id,
+        dh,
+        xm_id,
+        xmbh,
+        xmmc,
+        dbnr_id,
+        dbnr_name,
+        dept_id,
+        dept_name,
+        dbdj,
+        yqwcsj,
+        (CASE
+        when  DATEDIFF(NOW(),yqwcsj)&gt;0 THEN DATEDIFF(NOW(),yqwcsj)
+        when  DATEDIFF(NOW(),yqwcsj)&lt;=0 THEN 0
+        END)cqts,
+
+        (CASE
+        when  DATEDIFF(NOW(),yqwcsj)&lt;=0  THEN 0
+        when  DATEDIFF(NOW(),yqwcsj)&gt;0 and DATEDIFF(NOW(),yqwcsj)&lt;=15 THEN 1
+        when  DATEDIFF(NOW(),yqwcsj)&gt;15 THEN 2
+        END)type,
+        is_wc,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark
+        FROM
+        fgw_dbd
+        <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="dbnrId != null "> and dbnr_id = #{dbnrId}</if>
+            <if test="dbnrName != null  and dbnrName != ''"> and dbnr_name like concat('%', #{dbnrName}, '%')</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="dbdj != null  and dbdj != ''"> and dbdj = #{dbdj}</if>
+            <if test="yqwcsj != null "> and yqwcsj = #{yqwcsj}</if>
+            <if test="cqts != null "> and cqts = #{cqts}</if>
+            <if test="isWc != null  and isWc != ''"> and is_wc = #{isWc}</if>
+        </where>
+    </select>
+    
+    <select id="selectFgwDbdById" parameterType="Long" resultMap="FgwDbdResult">
+        SELECT
+            id,
+            dh,
+            xm_id,
+            xmbh,
+            xmmc,
+            dbnr_id,
+            dbnr_name,
+            dept_id,
+            dept_name,
+            dbdj,
+            yqwcsj,
+            (CASE
+                 when  DATEDIFF(NOW(),yqwcsj)&gt;0 THEN DATEDIFF(NOW(),yqwcsj)
+                 when  DATEDIFF(NOW(),yqwcsj)&lt;=0 THEN 0
+                END)cqts,
+
+            (CASE
+                 when  DATEDIFF(NOW(),yqwcsj)&lt;=0  THEN 0
+                 when  DATEDIFF(NOW(),yqwcsj)&gt;0 and DATEDIFF(NOW(),yqwcsj)&lt;=15 THEN 1
+                 when  DATEDIFF(NOW(),yqwcsj)&gt;15 THEN 2
+                END)type,
+            is_wc,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            remark
+        FROM
+            fgw_dbd
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFgwDbd" parameterType="FgwDbd" useGeneratedKeys="true" keyProperty="id">
+        insert into fgw_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="dbnrId != null">dbnr_id,</if>
+            <if test="dbnrName != null and dbnrName != ''">dbnr_name,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="dbdj != null and dbdj != ''">dbdj,</if>
+            <if test="yqwcsj != null">yqwcsj,</if>
+            <if test="cqts != null">cqts,</if>
+            <if test="isWc != null and isWc != ''">is_wc,</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="dbnrId != null">#{dbnrId},</if>
+            <if test="dbnrName != null and dbnrName != ''">#{dbnrName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="dbdj != null and dbdj != ''">#{dbdj},</if>
+            <if test="yqwcsj != null">#{yqwcsj},</if>
+            <if test="cqts != null">#{cqts},</if>
+            <if test="isWc != null and isWc != ''">#{isWc},</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="updateFgwDbd" parameterType="FgwDbd">
+        update fgw_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="dbnrId != null">dbnr_id = #{dbnrId},</if>
+            <if test="dbnrName != null and dbnrName != ''">dbnr_name = #{dbnrName},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="dbdj != null and dbdj != ''">dbdj = #{dbdj},</if>
+            <if test="yqwcsj != null">yqwcsj = #{yqwcsj},</if>
+            <if test="cqts != null">cqts = #{cqts},</if>
+            <if test="isWc != null and isWc != ''">is_wc = #{isWc},</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="updateFgwDbdByDbnrId">
+        update fgw_dbd set is_wc = 'Y' ,update_time = sysdate() where xm_id = #{xmId} and dbnr_id = #{type}
+    </update>
+
+    <delete id="deleteFgwDbdById" parameterType="Long">
+        delete from fgw_dbd where id = #{id}
+    </delete>
+
+    <delete id="deleteFgwDbdByIds" parameterType="String">
+        delete from fgw_dbd where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/fgw/FgwLdpsMapper.xml

@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFgwLdpsList" parameterType="FgwLdps" resultMap="FgwLdpsResult">
         <include refid="selectFgwLdpsVo"/>
-        <where>  
+        <where>
+            psnr is not null
             <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>

ruoyi-system/src/main/resources/mapper/system/fgw/FgwXmsbMapper.xml

@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
+        ${params.dataScope}
     </select>
     
     <select id="selectFgwXmsbById" parameterType="Long" resultMap="FgwXmsbResult">
@@ -96,6 +97,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            ( (progress = '1' and status = '2') or (progress &gt; 1))
         </where>
     </select>
+    <select id="ldpsList" resultMap="FgwXmsbResult" parameterType="FgwXmsb">
+        <include refid="selectFgwXmsbVo"/>
+        <where>
+            psnr is not null
+            <if test="xmmc != null  and xmmc != ''"> and xmmc = #{xmmc}</if>
+            <if test="xmbh != null  and xmbh != ''"> and xmbh = #{xmbh}</if>
+            <if test="xmdw != null  and xmdw != ''"> and xmdw = #{xmdw}</if>
+            <if test="qtzrdw != null  and qtzrdw != ''"> and qtzrdw = #{qtzrdw}</if>
+            <if test="qtsld != null  and qtsld != ''"> and qtsld = #{qtsld}</if>
+            <if test="gmnr != null  and gmnr != ''"> and gmnr = #{gmnr}</if>
+            <if test="jhkgsj != null "> and jhkgsj = #{jhkgsj}</if>
+            <if test="xmztz != null  and xmztz != ''"> and xmztz = #{xmztz}</if>
+            <if test="sjbz != null  and sjbz != ''"> and sjbz = #{sjbz}</if>
+            <if test="sczbj != null  and sczbj != ''"> and sczbj = #{sczbj}</if>
+            <if test="zxz != null  and zxz != ''"> and zxz = #{zxz}</if>
+            <if test="ppp != null  and ppp != ''"> and ppp = #{ppp}</if>
+            <if test="rz != null  and rz != ''"> and rz = #{rz}</if>
+            <if test="ndjh != null  and ndjh != ''"> and ndjh = #{ndjh}</if>
+            <if test="sjbzzjqd != null  and sjbzzjqd != ''"> and sjbzzjqd = #{sjbzzjqd}</if>
+            <if test="rzqd != null  and rzqd != ''"> and rzqd = #{rzqd}</if>
+            <if test="dq != null  and dq != ''"> and dq = #{dq}</if>
+            <if test="jsdw != null  and jsdw != ''"> and jsdw = #{jsdw}</if>
+            <if test="jsDeptId != null "> and js_dept_id = #{jsDeptId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null "> and dept_name = #{deptName}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="kgsj != null "> and kgsj = #{kgsj}</if>
+            <if test="ntsj != null "> and ntsj = #{ntsj}</if>
+            <if test="ntxmtc != null  and ntxmtc != ''"> and ntxmtc = #{ntxmtc}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(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(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
+        </where>
+        ${params.dataScope}
+    </select>
 
     <insert id="insertFgwXmsb" parameterType="FgwXmsb" useGeneratedKeys="true" keyProperty="id">
         insert into fgw_xmsb

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

@@ -788,7 +788,7 @@
         </if>
 
         )d
-
+        ${params.dataScope}
         order by d.create_time desc
     </select>