数据列表显示总数

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

@@ -34,9 +34,10 @@ public class ZsyzSbbzbController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZsyzSbbzb zsyzSbbzb)
     {
+        long count = zsyzSbbzbService.selectZsyzSbbzbListCount(zsyzSbbzb);
         startPage();
         List<ZsyzSbbzb> list = zsyzSbbzbService.selectZsyzSbbzbList(zsyzSbbzb);
-        return getDataTable(list);
+        return getDataTable(list,count);
     }
 
     /**
@@ -45,9 +46,11 @@ public class ZsyzSbbzbController extends BaseController
     @GetMapping("/ldps/list")
     public TableDataInfo ldpsList(ZsyzSbbzb zsyzSbbzb)
     {
+        //查询总数
+        long count = zsyzSbbzbService.ldpsListCount(zsyzSbbzb);
         startPage();
         List<ZsyzSbbzb> list = zsyzSbbzbService.ldpsList(zsyzSbbzb);
-        return getDataTable(list);
+        return getDataTable(list,count);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -90,6 +90,21 @@ public class BaseController
         return rspData;
     }
 
+
+    /**
+     * 响应请求分页数据自己查总数
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable(List<?> list, long total)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(total);
+        return rspData;
+    }
+
     /**
      * 返回成功
      */

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

@@ -76,5 +76,8 @@ public interface ZsyzSbbzbMapper
 
     List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
 
-    int ldpsListCount();
+
+    long ldpsListCount(ZsyzSbbzb zsyzSbbzb);
+
+    long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb);
 }

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

@@ -181,4 +181,14 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
 
         return zsyzSbbzbMapper.ldpsList(zsyzSbbzb);
     }
+
+    @Override
+    public long ldpsListCount(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzSbbzbMapper.ldpsListCount(zsyzSbbzb);
+    }
+
+    @Override
+    public long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb) {
+        return zsyzSbbzbMapper.selectZsyzSbbzbListCount(zsyzSbbzb);
+    }
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 import com.ruoyi.system.domain.projectV2.ZsyzShyj;
 import com.ruoyi.system.domain.projectV2.ZsyzSkxm;
@@ -87,7 +88,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
     @Override
     public AjaxResult census() {
         //先去redis 中查询
-        Map<String, Integer> map = redisCache.getCacheObject(INDEX);
+        Map<String, Object> map = redisCache.getCacheObject(INDEX);
         if (map == null) {
             map = new HashMap<>();
             //定义返回值
@@ -172,7 +173,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             map.put("wt", 0);
 
             //统计批示项目数量
-            int ps = zsyzSbbzbMapper.ldpsListCount();
+            long ps = zsyzSbbzbMapper.ldpsListCount(new ZsyzSbbzb());
             map.put("ps", ps);
             map.put("all", all);
             redisCache.setCacheObject(INDEX, map,1, TimeUnit.HOURS);

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

@@ -69,4 +69,8 @@ public interface IZsyzSbbzbService
     List<ZsyzSbbzb> selectZsyzSbbzbListDc(ZsyzSbbzb zsyzSbbzb);
 
     List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
+
+    long ldpsListCount(ZsyzSbbzb zsyzSbbzb);
+
+    long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb);
 }

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

@@ -177,7 +177,54 @@
         <result property="remark" column="remark"/>
     </resultMap>
     <sql id="selectZsyzSbbzbVo">
-        select id, sbdw, tbrq, zszxfzr, xmbh, xmxsmc, sfwlhxxxm, yzdq_id, yzdq_name, yzss_name, ntze, cylx_id, cylx_name, xmlb, tzlb, nlhd, czpt, tzzt, xmjz, gtzzrsfzhm, qytzrxyzdm, qybj, tzfjj, sndxse, sndnse, tzrxm, tzrzw, tzrdh, xmjj, name, strq, phone, zw, user_id, create_by, type, progress, dept_id, create_time, update_by, is_del, update_time, remark, cjd_id, cjd_name, is_meet, meet_remark from zsyz_sbbzb
+        select id,
+               sbdw,
+               tbrq,
+               zszxfzr,
+               xmbh,
+               xmxsmc,
+               sfwlhxxxm,
+               yzdq_id,
+               yzdq_name,
+               yzss_name,
+               ntze,
+               cylx_id,
+               cylx_name,
+               xmlb,
+               tzlb,
+               nlhd,
+               czpt,
+               tzzt,
+               xmjz,
+               gtzzrsfzhm,
+               qytzrxyzdm,
+               qybj,
+               tzfjj,
+               sndxse,
+               sndnse,
+               tzrxm,
+               tzrzw,
+               tzrdh,
+               xmjj,
+               name,
+               strq,
+               phone,
+               zw,
+               user_id,
+               create_by,
+               type,
+               progress,
+               dept_id,
+               create_time,
+               update_by,
+               is_del,
+               update_time,
+               remark,
+               cjd_id,
+               cjd_name,
+               is_meet,
+               meet_remark
+        from zsyz_sbbzb
     </sql>
 
     <select id="selectZsyzSbbzbList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
@@ -319,14 +366,57 @@
         </where>
     </select>
     <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
-        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
+        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
         from zsyz_project_dept d
-        left join zsyz_sbbzb s on s.id = d.xm_id
-      where  s.is_del = 'N'
-      and (d.dept_id = #{deptId} or s.depe_id = #{deptId})
+                 left join zsyz_sbbzb s on s.id = d.xm_id
+        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,
@@ -393,13 +483,119 @@
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    <select id="ldpsListCount" resultType="java.lang.Integer">
-        select count(1) from (select s.id
+    <select id="ldpsListCount" resultType="java.lang.Long">
+        select count(1)
+        from (select s.id
         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 group by  s.id ) a
+        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>
+        group by s.id ) a
     </select>
+    <select id="selectZsyzSbbzbListCount" resultType="java.lang.Long">
+        select count(1)
+        from (
+        select s.id
+        from zsyz_sbbzb s
+        left join zsyz_shyj j on s.id = j.xm_id
+        <where>
+            s.is_del = 'N'
+            <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>
+        group by s.id ) a
+    </select>
+
 
     <insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_sbbzb
@@ -554,7 +750,10 @@
         where id = #{id}
     </update>
     <update id="updateZsyzSbbzbCjd" parameterType="ZsyzSbbzb">
-                update zsyz_sbbzb set cjd_id = #{cjdId},cjd_name = #{cjdName} where id = #{id}
+        update zsyz_sbbzb
+        set cjd_id   = #{cjdId},
+            cjd_name = #{cjdName}
+        where id = #{id}
     </update>
     <update id="updateZsyzSbbzbForZc" parameterType="ZsyzSbbzb">
         update zsyz_sbbzb
@@ -565,11 +764,15 @@
         where id = #{id}
     </update>
     <update id="updateZsyzSbbzbProgress" parameterType="ZsyzSbbzb">
-         update zsyz_sbbzb set progress = #{progress} where id = #{id}
+        update zsyz_sbbzb
+        set progress = #{progress}
+        where id = #{id}
     </update>
 
     <delete id="deleteZsyzSbbzbById" parameterType="Long">
-        delete from zsyz_sbbzb where id = #{id}
+        delete
+        from zsyz_sbbzb
+        where id = #{id}
     </delete>
 
     <delete id="deleteZsyzSbbzbByIds" parameterType="String">