1

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

@@ -3,7 +3,10 @@ package com.ruoyi.web.controller.fgw;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.system.domain.vo.JdapVo;
+import com.ruoyi.system.domain.vo.SbxmVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -127,9 +130,10 @@ public class FgwJdapController extends BaseController
      * idList 项目idlist
      */
     @PreAuthorize("@ss.hasPermi('fgw:sytj:sycb')")
-    @GetMapping("/sycb")
-    public AjaxResult sycb(@RequestParam("idList") List<Long> idList)
+    @PostMapping("/sycb")
+    public AjaxResult sycb(@RequestBody SbxmVo sbxmVo)
     {
+        List<Long> idList = sbxmVo.getIdList();
         return fgwJdapService.sycb(idList);
     }
 

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

@@ -66,7 +66,6 @@ public class FgwXmsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('fgw:xmsb:xmyj:list')")
     public TableDataInfo xmyjList(FgwXmsb fgwXmsb)
     {
-        startPage();
         List<FgwXmsb> list = fgwXmsbService.xmyjList(fgwXmsb);
         return getDataTable(list);
     }
@@ -79,7 +78,6 @@ public class FgwXmsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('fgw:xmsb:cqxm:list')")
     public TableDataInfo cqxmList(FgwXmsb fgwXmsb)
     {
-        startPage();
         List<FgwXmsb> list = fgwXmsbService.cqxmList(fgwXmsb);
         return getDataTable(list);
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SbxmVo.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.fgw.FgwJdap;
+
+import java.util.List;
+
+public class SbxmVo {
+
+    //发改委_节点安排数组
+    private List<Long> idList;
+
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
+    }
+
+    public List<Long> getIdList() {
+
+        return idList;
+    }
+}

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

@@ -15,6 +15,8 @@ import com.ruoyi.system.service.fgw.IFgwJzqkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import static com.ruoyi.common.constant.CommonConstants.ONE;
+
 
 /**
  * 发改委_进展情况Service业务层处理
@@ -125,6 +127,7 @@ public class FgwJzqkServiceImpl implements IFgwJzqkService {
     @Override
     public int updateFgwJzqk(FgwJzqk fgwJzqk) {
         fgwJzqk.setUpdateTime(DateUtils.getNowDate());
+        fgwJzqk.setIsSh(ONE);
         List<FgwFj> fjList = fgwJzqk.getFjList();
         fgwFjMapper.deleteFgwFjByXmId(fgwJzqk.getXmId(),18L);
         if (fjList != null && fjList.size() > 0) {

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.fgw.*;
@@ -159,6 +160,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
     }
 
     @Override
+    @DataScope(deptAlias = "d")
     public AjaxResult selectFgwXmsbListAll(FgwXmsb fgwXmsb) {
         Map<String, Integer> map = new HashMap<>();
         map.put("all", 0);
@@ -189,7 +191,7 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
             fgwYjpz.setYzcqts(7L);
         }
         List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapNum(fgwYjpz.getYjts());
-
+        startPage();
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
         if (fgwJdapList.size() > 0) {
             List<Long> xmidList = fgwJdapList.stream().map(FgwJdap::getXmId).collect(Collectors.toList());
@@ -200,11 +202,19 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
         return fgwXmsbList;
     }
 
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage()
+    {
+        PageUtils.startPage();
+    }
+
     @Override
     public List<FgwXmsb> cqxmList(FgwXmsb fgwXmsb) {
         //List<FgwDbd> fgwDbdListCq = fgwDbdMapper.selectFgwDbdCqxmNum();
         List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapCqxmNum();
-
+        startPage();
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
         if (fgwJdapList.size() > 0) {
             List<Long> xmidList = fgwJdapList.stream().map(FgwJdap::getXmId).collect(Collectors.toList());

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

@@ -102,8 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(d.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
+            ${params.dataScope}
         </where>
-        ${params.dataScope}
+
         order by d.create_time desc
     </select>
     
@@ -118,89 +119,95 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="ldpsList" resultMap="FgwXmsbResult" parameterType="FgwXmsb">
-        <include refid="selectFgwXmsbVo"/>
+        select d.id, d.xmmc, d.xmbh,d.nkgsj,d.jgsj,d.njgsj,d.nttz,d.xmbq,d.is_js,d.is_wt,d.wt_type, d.xmdw, d.qtzrdw, d.qtsld, d.gmnr, d.jhkgsj, d.xmztz,
+               d.sjbz, d.sczbj, d.zxz, d.ppp, d.rz, d.ndjh, d.sjbzzjqd, d.rzqd, d.dq, d.jsdw, d.js_dept_id, d.dept_id,d.dept_name, d.user_id, d.kgsj, d.ntsj,
+               d.ntxmtc, d.type, d.progress, d.status, d.create_by, d.create_time, d.update_by, d.update_time, d.remark,d.psnr from fgw_xmsb d
         <where>
-            psnr is not null and psnr != ''
-            <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="isWt != null  and isWt != ''"> and is_wt = #{isWt}</if>
-            <if test="wtType != null  and wtType != ''"> and wt_type = #{wtType}</if>
+            d.psnr is not null and d.psnr != ''
+            <if test="xmmc != null  and xmmc != ''"> and d.xmmc = #{xmmc}</if>
+            <if test="xmbh != null  and xmbh != ''"> and d.xmbh = #{xmbh}</if>
+            <if test="xmdw != null  and xmdw != ''"> and d.xmdw = #{xmdw}</if>
+            <if test="qtzrdw != null  and qtzrdw != ''"> and d.qtzrdw = #{qtzrdw}</if>
+            <if test="qtsld != null  and qtsld != ''"> and d.qtsld = #{qtsld}</if>
+            <if test="gmnr != null  and gmnr != ''"> and d.gmnr = #{gmnr}</if>
+            <if test="jhkgsj != null "> and d.jhkgsj = #{jhkgsj}</if>
+            <if test="xmztz != null  and xmztz != ''"> and d.xmztz = #{xmztz}</if>
+            <if test="sjbz != null  and sjbz != ''"> and d.sjbz = #{sjbz}</if>
+            <if test="sczbj != null  and sczbj != ''"> and d.sczbj = #{sczbj}</if>
+            <if test="zxz != null  and zxz != ''"> and d.zxz = #{zxz}</if>
+            <if test="ppp != null  and ppp != ''"> and d.ppp = #{ppp}</if>
+            <if test="rz != null  and rz != ''"> and d.rz = #{rz}</if>
+            <if test="ndjh != null  and ndjh != ''"> and d.ndjh = #{ndjh}</if>
+            <if test="sjbzzjqd != null  and sjbzzjqd != ''"> and d.sjbzzjqd = #{sjbzzjqd}</if>
+            <if test="rzqd != null  and rzqd != ''"> and d.rzqd = #{rzqd}</if>
+            <if test="dq != null  and dq != ''"> and d.dq = #{dq}</if>
+            <if test="jsdw != null  and jsdw != ''"> and d.jsdw = #{jsdw}</if>
+            <if test="jsDeptId != null "> and d.js_dept_id = #{jsDeptId}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="deptName != null "> and d.dept_name = #{deptName}</if>
+            <if test="userId != null "> and d.user_id = #{userId}</if>
+            <if test="kgsj != null "> and d.kgsj = #{kgsj}</if>
+            <if test="ntsj != null "> and d.ntsj = #{ntsj}</if>
+            <if test="ntxmtc != null  and ntxmtc != ''"> and d.ntxmtc = #{ntxmtc}</if>
+            <if test="type != null  and type != ''"> and d.type = #{type}</if>
+            <if test="progress != null  and progress != ''"> and d.progress = #{progress}</if>
+            <if test="status != null  and status != ''"> and d.status = #{status}</if>
+            <if test="isWt != null  and isWt != ''"> and d.is_wt = #{isWt}</if>
+            <if test="wtType != null  and wtType != ''"> and d.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')
+                AND date_format(d.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')
+                AND date_format(d.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
+            ${params.dataScope}
         </where>
-        ${params.dataScope}
+
     </select>
     <select id="selectFgwXmsbListAll" resultMap="FgwXmsbResult">
-        <include refid="selectFgwXmsbVo"/>
+        select d.id, d.xmmc, d.xmbh,d.nkgsj,d.jgsj,d.njgsj,d.nttz,d.xmbq,d.is_js,d.is_wt,d.wt_type, d.xmdw, d.qtzrdw, d.qtsld, d.gmnr, d.jhkgsj, d.xmztz,
+        d.sjbz, d.sczbj, d.zxz, d.ppp, d.rz, d.ndjh, d.sjbzzjqd, d.rzqd, d.dq, d.jsdw, d.js_dept_id, d.dept_id,d.dept_name, d.user_id, d.kgsj, d.ntsj,
+        d.ntxmtc, d.type, d.progress, d.status, d.create_by, d.create_time, d.update_by, d.update_time, d.remark,d.psnr from fgw_xmsb d
         <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>
-            <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="isWt != null  and isWt != ''"> and d.is_wt = #{isWt}</if>
+            <if test="wtType != null  and wtType != ''"> and d.wt_type = #{wtType}</if>
+            <if test="xmmc != null  and xmmc != ''"> and d.xmmc = #{xmmc}</if>
+            <if test="xmbh != null  and xmbh != ''"> and d.xmbh = #{xmbh}</if>
+            <if test="xmdw != null  and xmdw != ''"> and d.xmdw = #{xmdw}</if>
+            <if test="qtzrdw != null  and qtzrdw != ''"> and d.qtzrdw = #{qtzrdw}</if>
+            <if test="qtsld != null  and qtsld != ''"> and d.qtsld = #{qtsld}</if>
+            <if test="gmnr != null  and gmnr != ''"> and d.gmnr = #{gmnr}</if>
+            <if test="jhkgsj != null "> and d.jhkgsj = #{jhkgsj}</if>
+            <if test="xmztz != null  and xmztz != ''"> and d.xmztz = #{xmztz}</if>
+            <if test="sjbz != null  and sjbz != ''"> and d.sjbz = #{sjbz}</if>
+            <if test="sczbj != null  and sczbj != ''"> and d.sczbj = #{sczbj}</if>
+            <if test="zxz != null  and zxz != ''"> and d.zxz = #{zxz}</if>
+            <if test="ppp != null  and ppp != ''"> and d.ppp = #{ppp}</if>
+            <if test="rz != null  and rz != ''"> and d.rz = #{rz}</if>
+            <if test="ndjh != null  and ndjh != ''"> and d.ndjh = #{ndjh}</if>
+            <if test="sjbzzjqd != null  and sjbzzjqd != ''"> and d.sjbzzjqd = #{sjbzzjqd}</if>
+            <if test="rzqd != null  and rzqd != ''"> and d.rzqd = #{rzqd}</if>
+            <if test="dq != null  and dq != ''"> and d.dq = #{dq}</if>
+            <if test="jsdw != null  and jsdw != ''"> and d.jsdw = #{jsdw}</if>
+            <if test="jsDeptId != null "> and d.js_dept_id = #{jsDeptId}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="deptName != null "> and d.dept_name = #{deptName}</if>
+            <if test="userId != null "> and d.user_id = #{userId}</if>
+            <if test="kgsj != null "> and d.kgsj = #{kgsj}</if>
+            <if test="ntsj != null "> and d.ntsj = #{ntsj}</if>
+            <if test="ntxmtc != null  and ntxmtc != ''"> and d.ntxmtc = #{ntxmtc}</if>
+            <if test="type != null  and type != ''"> and d.type = #{type}</if>
+            <if test="progress != null  and progress != ''"> and d.progress = #{progress}</if>
+            <if test="status != null  and status != ''"> and d.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>
+            ${params.dataScope}
         </where>
-        ${params.dataScope}
+
     </select>
     <select id="selectFgwXmsbByIdList" resultMap="FgwXmsbResult">
         <include refid="selectFgwXmsbVo"/>