新增发改委审核相关接口

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.fgw;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.fgw.FgwShyj;
+import com.ruoyi.system.domain.fgw.FgwXmsb;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
 import com.ruoyi.system.service.fgw.IFgwCommonService;
 import com.ruoyi.system.service.fgw.IFgwShyjService;
@@ -26,7 +27,7 @@ public class FgwCommonController {
     private IFgwCommonService fgwCommonService;
 
     /**
-     * 招商中心项目审核/驳回接口
+     * 发改委项目审核/驳回接口 申报库到项目库审核
      * 参数是审核建议
      *
      * @return
@@ -38,6 +39,69 @@ public class FgwCommonController {
         return fgwShyjService.xssh(fgwShyj);
     }
 
+    /**
+     * 发改委项目审核/驳回接口 前期工作手续审核
+     * 参数是审核建议
+     *
+     * @return
+     */
+    @PostMapping("/sxsh")
+    @PreAuthorize("@ss.hasPermi('fgw:common:sxsh')")
+    public AjaxResult sxsh(@RequestBody FgwShyj fgwShyj) {
+        //所有审核需要往审核意见表插入数据
+        return fgwShyjService.sxsh(fgwShyj);
+    }
+
+    /**
+     * 发改委项目审核/驳回接口 建设阶段审核
+     * 参数是审核建议
+     *
+     * @return
+     */
+    @PostMapping("/jssh")
+    @PreAuthorize("@ss.hasPermi('fgw:common:jssh')")
+    public AjaxResult jssh(@RequestBody FgwShyj fgwShyj) {
+        //所有审核需要往审核意见表插入数据
+        return fgwShyjService.jssh(fgwShyj);
+    }
+
+    /**
+     * 发改委项目 竣工阶段申请
+     *
+     * @return
+     */
+    @PostMapping("/jgsq")
+    @PreAuthorize("@ss.hasPermi('fgw:common:jgsq')")
+    public AjaxResult jgsq(@RequestBody FgwXmsb fgwXmsb) {
+        //所有审核需要往审核意见表插入数据
+        return fgwShyjService.jgsq(fgwXmsb);
+    }
+    /**
+     * 发改委项目审核/驳回接口 竣工阶段审核
+     * 参数是审核建议
+     *
+     * @return
+     */
+    @PostMapping("/jgsh")
+    @PreAuthorize("@ss.hasPermi('fgw:common:jgsh')")
+    public AjaxResult jgsh(@RequestBody FgwShyj fgwShyj) {
+        //所有审核需要往审核意见表插入数据
+        return fgwShyjService.jgsh(fgwShyj);
+    }
+
+    /**
+     * 发改委项目审核/驳回接口 进展情况审核
+     * 参数是审核建议
+     *
+     * @return
+     */
+    @PostMapping("/jzqksh")
+    @PreAuthorize("@ss.hasPermi('fgw:common:jzqksh')")
+    public AjaxResult jzqksh(@RequestBody FgwShyj fgwShyj) {
+        //所有审核需要往审核意见表插入数据
+        return fgwShyjService.jzqksh(fgwShyj);
+    }
+
     /**
      * 首页统计
      *

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

@@ -41,6 +41,18 @@ public class FgwFj extends BaseEntity
     /** 附件类型 1: 节能审查 2: 用地预审与选址意见书 3:核准/备案 4:建议书批复 5:可研批复 6:初步设计批复 7:环境影响评价 8:生态红线不可避让论证 9: 建设用地规划许可证 10:建设工程规划许可证 11:农用地转用和土地征收批复 12:划拨决定书 13:土地出让合同 14:不动产权证 15: 工程招投标 16: 施工许可证 17: 竣工资料 18:进展情况  */
     @Excel(name = "附件类型 1: 节能审查 2: 用地预审与选址意见书 3:核准/备案 4:建议书批复 5:可研批复 6:初步设计批复 7:环境影响评价 8:生态红线不可避让论证 9: 建设用地规划许可证 10:建设工程规划许可证 11:农用地转用和土地征收批复 12:划拨决定书 13:土地出让合同 14:不动产权证 15: 工程招投标 16: 施工许可证 17: 竣工资料 18:进展情况 ")
     private String type;
+    /**
+     * 是否审核
+     */
+    private String isSh;
+
+    public String getIsSh() {
+        return isSh;
+    }
+
+    public void setIsSh(String isSh) {
+        this.isSh = isSh;
+    }
 
     public Long getSourceId() {
         return sourceId;

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

@@ -57,6 +57,54 @@ public class FgwJzqk extends BaseEntity
 
     private List<FgwFj> fjList;
 
+    /** 是否建设 N否 Y是 */
+    @Excel(name = "是否建设 N否 Y是")
+    private String isJs;
+
+    /** 是否纳统 N否 Y是 */
+    @Excel(name = "是否纳统 N否 Y是")
+    private String isNt;
+
+    /** 纳统投资 */
+    @Excel(name = "纳统投资")
+    private String nttz;
+    /**
+     * 是否审核
+     */
+    private String isSh;
+
+    public String getIsSh() {
+        return isSh;
+    }
+
+    public void setIsSh(String isSh) {
+        this.isSh = isSh;
+    }
+
+    public String getIsJs() {
+        return isJs;
+    }
+
+    public void setIsJs(String isJs) {
+        this.isJs = isJs;
+    }
+
+    public String getIsNt() {
+        return isNt;
+    }
+
+    public void setIsNt(String isNt) {
+        this.isNt = isNt;
+    }
+
+    public String getNttz() {
+        return nttz;
+    }
+
+    public void setNttz(String nttz) {
+        this.nttz = nttz;
+    }
+
     public List<FgwFj> getFjList() {
         return fjList;
     }

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

@@ -52,12 +52,25 @@ public class FgwShyj extends BaseEntity
     @Excel(name = "审核意见")
     private String shyj;
 
+    /**
+     * 文件类型1: 节能审查 2: 用地预审与选址意见书 3:核准/备案 4:建议书批复 5:可研批复 6:初步设计批复 7:环境影响评价 8:生态红线不可避让论证 9: 建设用地规划许可证 10:建设工程规划许可证 11:农用地转用和土地征收批复 12:划拨决定书 13:土地出让合同 14:不动产权证 15: 工程招投标 16: 施工许可证 17: 竣工资料 18:进展情况
+     */
+    private String wjlx;
+
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date shsj;
 
-    public void setId(Long id) 
+    public String getWjlx() {
+        return wjlx;
+    }
+
+    public void setWjlx(String wjlx) {
+        this.wjlx = wjlx;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -129,7 +129,7 @@ public class FgwXmsb extends BaseEntity
     private String type;
 
     /** 项目进度  */
-    @Excel(name = "项目进度 1:基本信息 2:前期工作手续")
+    @Excel(name = "项目进度 1:基本信息 2:前期工作手续 3:竣工")
     private String progress;
 
     /** 状态  */
@@ -148,6 +148,104 @@ public class FgwXmsb extends BaseEntity
 
     private List<Long> idList;
 
+    /** 拟开工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "拟开工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nkgsj;
+
+    /** 竣工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "竣工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jgsj;
+
+    /** 拟竣工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "拟竣工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date njgsj;
+
+    /** 纳统最近一次投资  */
+    @Excel(name = "纳统最近一次投资")
+    private String nttz;
+
+    /** 项目标签  */
+    @Excel(name = "项目标签")
+    private String xmbq;
+
+    /** 是否建设 N否 Y是  */
+    @Excel(name = "是否建设 N否 Y是")
+    private String isJs;
+    /** 是否问题项目 N否 Y是  */
+    @Excel(name = "是否问题项目 N否 Y是")
+    private String isWt;
+
+    /** 是问题项目种类  */
+    @Excel(name = "是问题项目种类")
+    private String wtType;
+
+    public String getIsWt() {
+        return isWt;
+    }
+
+    public void setIsWt(String isWt) {
+        this.isWt = isWt;
+    }
+
+    public String getWtType() {
+        return wtType;
+    }
+
+    public void setWtType(String wtType) {
+        this.wtType = wtType;
+    }
+
+    public Date getNkgsj() {
+        return nkgsj;
+    }
+
+    public void setNkgsj(Date nkgsj) {
+        this.nkgsj = nkgsj;
+    }
+
+    public Date getJgsj() {
+        return jgsj;
+    }
+
+    public void setJgsj(Date jgsj) {
+        this.jgsj = jgsj;
+    }
+
+    public Date getNjgsj() {
+        return njgsj;
+    }
+
+    public void setNjgsj(Date njgsj) {
+        this.njgsj = njgsj;
+    }
+
+    public String getNttz() {
+        return nttz;
+    }
+
+    public void setNttz(String nttz) {
+        this.nttz = nttz;
+    }
+
+    public String getXmbq() {
+        return xmbq;
+    }
+
+    public void setXmbq(String xmbq) {
+        this.xmbq = xmbq;
+    }
+
+    public String getIsJs() {
+        return isJs;
+    }
+
+    public void setIsJs(String isJs) {
+        this.isJs = isJs;
+    }
+
     public List<Long> getIdList() {
         return idList;
     }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.fgw;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.fgw.FgwShyj;
+import com.ruoyi.system.domain.fgw.FgwXmsb;
 
 import java.util.List;
 
@@ -66,4 +67,10 @@ public interface IFgwShyjService
      * 发改委审核
      */
     public AjaxResult xssh(FgwShyj fgwShyj);
+    public AjaxResult sxsh(FgwShyj fgwShyj);
+    public AjaxResult jssh(FgwShyj fgwShyj);
+    public AjaxResult jgsh(FgwShyj fgwShyj);
+    public AjaxResult jzqksh(FgwShyj fgwShyj);
+    //竣工申请
+    public AjaxResult jgsq(FgwXmsb fgwXmsb);
 }

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

@@ -5,16 +5,19 @@ import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.fgw.FgwFj;
+import com.ruoyi.system.domain.fgw.FgwJzqk;
 import com.ruoyi.system.domain.fgw.FgwShyj;
 import com.ruoyi.system.domain.fgw.FgwXmsb;
+import com.ruoyi.system.mapper.fgw.FgwFjMapper;
+import com.ruoyi.system.mapper.fgw.FgwJzqkMapper;
 import com.ruoyi.system.mapper.fgw.FgwShyjMapper;
 import com.ruoyi.system.mapper.fgw.FgwXmsbMapper;
 import com.ruoyi.system.service.fgw.IFgwShyjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import static com.ruoyi.common.constant.CommonConstants.THR;
-import static com.ruoyi.common.constant.CommonConstants.TWO;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 
 /**
@@ -30,6 +33,11 @@ public class FgwShyjServiceImpl implements IFgwShyjService {
 
     @Autowired
     private FgwXmsbMapper fgwXmsbMapper;
+    @Autowired
+    private FgwFjMapper fgwFjMapper ;
+
+    @Autowired
+    private FgwJzqkMapper fgwJzqkMapper;
 
     /**
      * 查询发改委_审核意见
@@ -119,6 +127,7 @@ public class FgwShyjServiceImpl implements IFgwShyjService {
             //审核通过修改项目状态
             fgwXmsb.setStatus(TWO);
             fgwXmsb.setType(TWO);
+            fgwXmsb.setProgress(TWO);
         } else if (THR.equals(shjg)) {
             fgwXmsb.setStatus(THR);
         }
@@ -131,4 +140,171 @@ public class FgwShyjServiceImpl implements IFgwShyjService {
         fgwShyjMapper.insertFgwShyj(fgwShyj);
         return AjaxResult.success();
     }
+
+    /**
+     * 前期工作手续审核
+     * @param fgwShyj
+     * @return
+     */
+    @Override
+    public AjaxResult sxsh(FgwShyj fgwShyj) {
+        //获取审核意见
+        String shjg = fgwShyj.getShjg();
+        Long xmId = fgwShyj.getXmId();
+        //修改对应附件状态
+        String wjlx = fgwShyj.getWjlx();
+        //查询附件表
+        FgwFj fgwFj = new FgwFj();
+        fgwFj.setXmId(xmId);
+        fgwFj.setType(wjlx);
+        List<FgwFj> fgwFjs = fgwFjMapper.selectFgwFjList(fgwFj);
+        if (fgwFjs != null && fgwFjs.size() > 0){
+            if (TWO.equals(shjg)) {
+                for (FgwFj fj : fgwFjs) {
+                    fj.setIsSh(TWO);
+                    fj.setRemark(fgwShyj.getShyj());
+                    fgwFjMapper.updateFgwFj(fj);
+                }
+            } else if (THR.equals(shjg)) {
+                for (FgwFj fj : fgwFjs) {
+                    fj.setIsSh(THR);
+                    fj.setRemark(fgwShyj.getShyj());
+                    fgwFjMapper.updateFgwFj(fj);
+                }
+            }
+        }
+        fgwShyj.setCreateTime(DateUtils.getNowDate());
+        fgwShyj.setDeptId(SecurityUtils.getDeptId());
+        fgwShyj.setShrxm(SecurityUtils.getUsername());
+        fgwShyj.setShsj(DateUtils.getNowDate());
+        fgwShyjMapper.insertFgwShyj(fgwShyj);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 建设阶段审核
+     * @param fgwShyj
+     * @return
+     */
+    @Override
+    public AjaxResult jssh(FgwShyj fgwShyj) {
+        //获取审核意见
+        String shjg = fgwShyj.getShjg();
+        //查询项目当前状态
+        FgwXmsb fgwXmsb = fgwXmsbMapper.selectFgwXmsbById(fgwShyj.getXmId());
+        if (!THR.equals(fgwXmsb.getIsJs())) {
+            return AjaxResult.error("当前项目已经是建设阶段或者还未申请,请勿审核");
+        }
+        if (TWO.equals(shjg)) {
+            //审核通过修改是否建设
+            fgwXmsb.setIsJs(TWO);
+        } else if (THR.equals(shjg)) {
+            fgwXmsb.setIsJs(ONE);
+        }
+        //修改主表状态
+        fgwXmsbMapper.updateFgwXmsbStatus(fgwXmsb);
+        fgwShyj.setCreateTime(DateUtils.getNowDate());
+        fgwShyj.setDeptId(SecurityUtils.getDeptId());
+        fgwShyj.setShrxm(SecurityUtils.getUsername());
+        fgwShyj.setShsj(DateUtils.getNowDate());
+        fgwShyjMapper.insertFgwShyj(fgwShyj);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 竣工审核
+     * @param fgwShyj
+     * @return
+     */
+    @Override
+    public AjaxResult jgsh(FgwShyj fgwShyj) {
+        //获取审核意见
+        String shjg = fgwShyj.getShjg();
+        //查询项目当前状态
+        FgwXmsb fgwXmsb = fgwXmsbMapper.selectFgwXmsbById(fgwShyj.getXmId());
+        if (THR.equals(fgwXmsb.getProgress()) && TWO.equals(fgwXmsb.getStatus())) {
+            return AjaxResult.error("当前项目已经竣工,请勿审核");
+        }
+        if (!(THR.equals(fgwXmsb.getProgress()) && ONE.equals(fgwXmsb.getStatus()))) {
+            return AjaxResult.error("当前项目未申请竣工,请勿审核");
+        }
+        if (TWO.equals(shjg)) {
+            //审核通过修改项目状态
+            fgwXmsb.setStatus(TWO);
+        } else if (THR.equals(shjg)) {
+            fgwXmsb.setStatus(THR);
+        }
+        //修改主表状态
+        fgwXmsbMapper.updateFgwXmsbStatus(fgwXmsb);
+        fgwShyj.setCreateTime(DateUtils.getNowDate());
+        fgwShyj.setDeptId(SecurityUtils.getDeptId());
+        fgwShyj.setShrxm(SecurityUtils.getUsername());
+        fgwShyj.setShsj(DateUtils.getNowDate());
+        fgwShyjMapper.insertFgwShyj(fgwShyj);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 进展情况审核
+     * @param fgwShyj
+     * @return
+     */
+    @Override
+    public AjaxResult jzqksh(FgwShyj fgwShyj) {
+        //id 就是进展情况id
+        Long id = fgwShyj.getId();
+        FgwJzqk fgwJzqk = fgwJzqkMapper.selectFgwJzqkById(id);
+        //获取审核意见
+        String shjg = fgwShyj.getShjg();
+        //查询项目当前状态
+        FgwXmsb fgwXmsb = fgwXmsbMapper.selectFgwXmsbById(fgwShyj.getXmId());
+        if (!ONE.equals(fgwJzqk.getIsSh())) {
+            return AjaxResult.error("当前进展情况已审核或已驳回,请勿审核");
+        }
+        if (TWO.equals(shjg)) {
+            //审核通过修改是否建设
+            fgwJzqk.setIsSh(TWO);
+            //判断纳统投资
+            String isNt = fgwJzqk.getIsNt();
+            if ("Y".equals(isNt)){
+                String nttz = fgwJzqk.getNttz();
+                fgwXmsb.setNttz(nttz);
+                long ntxmtc = Long.parseLong(fgwXmsb.getNtxmtc());
+                long result = ntxmtc + Long.parseLong(nttz);
+                fgwXmsb.setNtxmtc(String.valueOf(result));
+                //修改主表状态
+                fgwXmsbMapper.updateFgwXmsbStatus(fgwXmsb);
+            }
+        } else if (THR.equals(shjg)) {
+            fgwJzqk.setIsSh(THR);
+        }
+        fgwShyj.setCreateTime(DateUtils.getNowDate());
+        fgwShyj.setDeptId(SecurityUtils.getDeptId());
+        fgwShyj.setShrxm(SecurityUtils.getUsername());
+        fgwShyj.setShsj(DateUtils.getNowDate());
+        fgwShyjMapper.insertFgwShyj(fgwShyj);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 竣工申请
+     * @param fgwXmsb
+     * @return
+     */
+    @Override
+    public AjaxResult jgsq(FgwXmsb fgwXmsb) {
+        FgwFj fgwFj = new FgwFj();
+        fgwFj.setXmId(fgwXmsb.getId());
+        fgwFj.setType("17");
+        fgwFj.setIsSh(TWO);
+        //查询项目竣工申请附件有没有上传
+        List<FgwFj> fgwFjs = fgwFjMapper.selectFgwFjList(fgwFj);
+        if (fgwFjs == null || fgwFjs.size() == 0){
+            return AjaxResult.error("当前项目竣工资料未审核通过");
+        }
+        fgwXmsb.setProgress(THR);
+        fgwXmsb.setStatus(ONE);
+        fgwXmsbMapper.updateFgwXmsbStatus(fgwXmsb);
+        return AjaxResult.success();
+    }
 }

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

@@ -114,17 +114,17 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService
         //修改主表项目进入待审核
         fgwXmsb.setStatus(ONE);
         List<FgwFj> fjList = fgwXmsb.getFjList();
-        //删除之前的
-        fgwFjMapper.deleteFgwFjByXmId(fgwXmsb.getId(),1L);
+
         if (fjList != null && fjList.size() > 0){
-            //保存当前的
+            //保存新增的
             for (FgwFj fgwFj : fjList) {
-                fgwFjMapper.insertFgwFj(fgwFj);
+                Long id = fgwFj.getId();
+                if (id != null){
+                    fgwFjMapper.insertFgwFj(fgwFj);
+                }
                 //修改督办的状态
                 fgwDbdMapper.updateFgwDbdByDbnrId(fgwXmsb.getId(),fgwFj.getType());
-
             }
-
         }
         return fgwXmsbMapper.updateFgwXmsb(fgwXmsb);
     }

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

@@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="path"    column="path"    />
         <result property="type"    column="type"    />
         <result property="remark"    column="remark"    />
+        <result property="isSh"    column="is_sh"    />
     </resultMap>
 
     <sql id="selectFgwFjVo">
-        select id, xm_id, xmbh,source_id, fj_name, path, type, remark from fgw_fj
+        select id, xm_id, xmbh,source_id, fj_name, path, type, remark,is_sh from fgw_fj
     </sql>
 
     <select id="selectFgwFjList" parameterType="FgwFj" resultMap="FgwFjResult">
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
             <if test="path != null  and path != ''"> and path = #{path}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</if>
         </where>
     </select>
     
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">path,</if>
             <if test="type != null">type,</if>
             <if test="remark != null">remark,</if>
+            <if test="isSh != null and isSh != ''">is_sh,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmId != null">#{xmId},</if>
@@ -63,7 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">#{path},</if>
             <if test="type != null">#{type},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+            <if test="isSh != null and isSh != ''">isSh,</if>
+
+        </trim>
     </insert>
 
     <update id="updateFgwFj" parameterType="FgwFj">
@@ -75,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">path = #{path},</if>
             <if test="type != null">type = #{type},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="isSh != null and isSh != ''">is_sh = #{isSh},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -11,6 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="xmmc"    column="xmmc"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
+        <result property="isNt"    column="is_nt"    />
+        <result property="isJs"    column="is_js"    />
+        <result property="nttz"    column="nttz"    />
         <result property="jzqk"    column="jzqk"    />
         <result property="sgll"    column="sgll"    />
         <result property="hbTime"    column="hb_time"    />
@@ -19,10 +22,11 @@ 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"    />
+        <result property="isSh"    column="is_sh"    />
     </resultMap>
 
     <sql id="selectFgwJzqkVo">
-        select id, xm_id, xmbh, xmmc, dept_id, dept_name, jzqk, sgll, hb_time, create_by, create_time, update_by, update_time, remark from fgw_jzqk
+        select id, xm_id, xmbh,is_nt,is_js,nttz,is_sh, xmmc, dept_id, dept_name, jzqk, sgll, hb_time, create_by, create_time, update_by, update_time, remark from fgw_jzqk
     </sql>
 
     <select id="selectFgwJzqkList" parameterType="FgwJzqk" resultMap="FgwJzqkResult">
@@ -31,6 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="isNt != null  and isNt != ''"> and is_nt = #{isNt}</if>
+            <if test="isjs != null  and isjs != ''"> and is_js = #{isjs}</if>
+            <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</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="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
@@ -52,6 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="isNt != null  and isNt != ''"> and is_nt = #{isNt}</if>
+            <if test="isjs != null  and isjs != ''"> and is_js = #{isjs}</if>
+            <if test="isSh != null  and isSh != ''"> and is_sh = #{isSh}</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="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
@@ -74,6 +84,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmmc != null and xmmc != ''">xmmc,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null and deptName != ''">dept_name,</if>
+            <if test="isNt != null and isNt != ''">is_nt,</if>
+            <if test="isJs != null and isJs != ''">is_js,</if>
+            <if test="nttz != null and nttz != ''">nttz,</if>
+            <if test="isSh != null and isSh != ''">is_sh,</if>
             <if test="jzqk != null">jzqk,</if>
             <if test="sgll != null">sgll,</if>
             <if test="hbTime != null">hb_time,</if>
@@ -89,6 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null and deptName != ''">#{deptName},</if>
+            <if test="isNt != null and isNt != ''">#{isNt},</if>
+            <if test="isJs != null and isJs != ''">#{isJs},</if>
+            <if test="nttz != null and nttz != ''">#{nttz},</if>
+            <if test="isSh != null and isSh != ''">#{isSh},</if>
             <if test="jzqk != null">#{jzqk},</if>
             <if test="sgll != null">#{sgll},</if>
             <if test="hbTime != null">#{hbTime},</if>
@@ -108,6 +126,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="isNt != null and isNt != ''">is_nt = #{isNt},</if>
+            <if test="isJs != null and isJs != ''">is_js = #{isJs},</if>
+            <if test="nttz != null and nttz != ''">nttz = #{nttz},</if>
+            <if test="isSh != null and isSh != ''">is_sh = #{isSh},</if>
             <if test="jzqk != null">jzqk = #{jzqk},</if>
             <if test="sgll != null">sgll = #{sgll},</if>
             <if test="hbTime != null">hb_time = #{hbTime},</if>

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="shjg"    column="shjg"    />
         <result property="shyj"    column="shyj"    />
         <result property="shsj"    column="shsj"    />
+        <result property="wjlx"    column="wjlx"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFgwShyjVo">
-        select id, xm_id, xmbh, xmmc, dept_id, shrxm, wtlx, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from fgw_shyj
+        select id, xm_id, xmbh, xmmc, dept_id,wjlx, shrxm, wtlx, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from fgw_shyj
     </sql>
 
     <select id="selectFgwShyjList" parameterType="FgwShyj" resultMap="FgwShyjResult">
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wtlx != null  and wtlx != ''"> and wtlx = #{wtlx}</if>
             <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
             <if test="shyj != null  and shyj != ''"> and shyj = #{shyj}</if>
+            <if test="wjlx != null  and wjlx != ''"> and wjlx = #{wjlx}</if>
             <if test="shsj != null "> and shsj = #{shsj}</if>
         </where>
     </select>
@@ -56,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shrxm != null and shrxm != ''">shrxm,</if>
             <if test="wtlx != null and wtlx != ''">wtlx,</if>
             <if test="shjg != null and shjg != ''">shjg,</if>
+            <if test="wjlx != null and wjlx != ''">wjlx,</if>
             <if test="shyj != null">shyj,</if>
             <if test="shsj != null">shsj,</if>
             <if test="createBy != null">create_by,</if>
@@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shrxm != null and shrxm != ''">#{shrxm},</if>
             <if test="wtlx != null and wtlx != ''">#{wtlx},</if>
             <if test="shjg != null and shjg != ''">#{shjg},</if>
+            <if test="wjlx != null and wjlx != ''">#{wjlx},</if>
             <if test="shyj != null">#{shyj},</if>
             <if test="shsj != null">#{shsj},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -92,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shrxm != null and shrxm != ''">shrxm = #{shrxm},</if>
             <if test="wtlx != null and wtlx != ''">wtlx = #{wtlx},</if>
             <if test="shjg != null and shjg != ''">shjg = #{shjg},</if>
+            <if test="wjlx != null and wjlx != ''">wjlx = #{wjlx},</if>
             <if test="shyj != null">shyj = #{shyj},</if>
             <if test="shsj != null">shsj = #{shsj},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

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

@@ -40,10 +40,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="psnr" column="psnr"/>
+        <result property="nkgsj" column="nkgsj"/>
+        <result property="jgsj" column="jgsj"/>
+        <result property="njgsj" column="njgsj"/>
+        <result property="nttz" column="nttz"/>
+        <result property="xmbq" column="xmbq"/>
+        <result property="isJs" column="is_js"/>
+        <result property="isWt" column="is_wt"/>
+        <result property="wtType" column="wt_type"/>
     </resultMap>
 
     <sql id="selectFgwXmsbVo">
-        select id, xmmc, xmbh, xmdw, qtzrdw, qtsld, gmnr, jhkgsj, xmztz, sjbz, sczbj, zxz, ppp, rz, ndjh, sjbzzjqd, rzqd, dq, jsdw, js_dept_id, dept_id,dept_name, user_id, kgsj, ntsj, ntxmtc, type, progress, status, create_by, create_time, update_by, update_time, remark,psnr from fgw_xmsb
+        select id, xmmc, xmbh,nkgsj,jgsj,njgsj,nttz,xmbq,is_js,is_wt,wt_type, xmdw, qtzrdw, qtsld, gmnr, jhkgsj, xmztz, sjbz, sczbj, zxz, ppp, rz, ndjh, sjbzzjqd, rzqd, dq, jsdw, js_dept_id, dept_id,dept_name, user_id, kgsj, ntsj, ntxmtc, type, progress, status, create_by, create_time, update_by, update_time, remark,psnr from fgw_xmsb
     </sql>
 
     <select id="selectFgwXmsbList" parameterType="FgwXmsb" resultMap="FgwXmsbResult">
@@ -85,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="isWt != null  and isWt != ''"> and is_wt = #{isWt}</if>
+            <if test="wtType != null  and wtType != ''"> and wt_type = #{wtType}</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>
@@ -138,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="isWt != null  and isWt != ''"> and is_wt = #{isWt}</if>
+            <if test="wtType != null  and wtType != ''"> and wt_type = #{wtType}</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>
@@ -150,6 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFgwXmsbListAll" resultMap="FgwXmsbResult">
         <include refid="selectFgwXmsbVo"/>
         <where>
+            <if test="isWt != null  and isWt != ''"> and is_wt = #{isWt}</if>
+            <if test="wtType != null  and wtType != ''"> and wt_type = #{wtType}</if>
             <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>
@@ -225,6 +239,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="psnr != null">psnr,</if>
+            <if test="nkgsj != null">nkgsj,</if>
+            <if test="jgsj != null">jgsj,</if>
+            <if test="njgsj != null">njgsj,</if>
+            <if test="nttz != null">nttz,</if>
+            <if test="xmbq != null">xmbq,</if>
+            <if test="isJs != null">is_js,</if>
+            <if test="isWt != null and isWt != ''">is_wt,</if>
+            <if test="wtType != null and wtType != ''">wt_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="xmmc != null">#{xmmc},</if>
@@ -261,6 +283,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="psnr != null">#{psnr},</if>
+            <if test="nkgsj != null">#{nkgsj},</if>
+            <if test="jgsj != null">#{jgsj},</if>
+            <if test="njgsj != null">#{njgsj},</if>
+            <if test="nttz != null">#{nttz},</if>
+            <if test="xmbq != null">#{xmbq},</if>
+            <if test="isJs != null">#{isJs},</if>
+            <if test="isWt != null and isWt != ''">#{isWt},</if>
+            <if test="wtType != null and wtType != ''">#{wtType},</if>
          </trim>
     </insert>
 
@@ -301,6 +331,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="psnr != null">psnr = #{psnr},</if>
+            <if test="nkgsj != null">nkgsj = #{nkgsj},</if>
+            <if test="jgsj != null">jgsj = #{jgsj},</if>
+            <if test="njgsj != null">njgsj = #{njgsj},</if>
+            <if test="nttz != null">nttz = #{nttz},</if>
+            <if test="xmbq != null">xmbq = #{xmbq},</if>
+            <if test="is_js != null">is_js = #{isJs},</if>
+            <if test="isWt != null and isWt != ''">is_wt = #{isWt},</if>
+            <if test="wtType != null and wtType != ''">is_js = #{wtType},</if>
         </trim>
         where id = #{id}
     </update>