Merge remote-tracking branch 'origin/master'

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

@@ -47,6 +47,17 @@ public class ZsyzDbdController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询招商引资_督办单列表
+     */
+    @GetMapping("/number")
+    public AjaxResult number(ZsyzDbd zsyzDbd)
+    {
+        return zsyzDbdService.number(zsyzDbd);
+    }
+
+
     /**
      * 导出招商引资_督办单列表
      */

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

@@ -60,4 +60,6 @@ public interface ZsyzDbdMapper
      * @return 结果
      */
     public int deleteZsyzDbdByIds(Long[] ids);
+
+    long number(ZsyzDbd zsyzDbd);
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl.projectV2;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.projectV2.ZsyzDbd;
 import com.ruoyi.system.mapper.projectV2.ZsyzDbdMapper;
@@ -93,4 +95,10 @@ public class ZsyzDbdServiceImpl implements IZsyzDbdService
     {
         return zsyzDbdMapper.deleteZsyzDbdById(id);
     }
+
+    @Override
+    public AjaxResult number(ZsyzDbd zsyzDbd) {
+        long num = zsyzDbdMapper.number(zsyzDbd);
+        return AjaxResult.success("成功",num);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.projectV2;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.projectV2.ZsyzDbd;
 
 import java.util.List;
@@ -59,4 +60,6 @@ public interface IZsyzDbdService
      * @return 结果
      */
     public int deleteZsyzDbdById(Long id);
+
+    AjaxResult number(ZsyzDbd zsyzDbd);
 }

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

@@ -65,7 +65,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectZsyzDbdVo"/>
         where id = #{id}
     </select>
-        
+    <select id="number" resultType="java.lang.Long">
+        select count(1) from zsyz_dbd
+        <where>
+            is_hf = 'N'
+            <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="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="isHf != null  and isHf != ''"> and is_hf = #{isHf}</if>
+            <if test="dbTime != null "> and db_time = #{dbTime}</if>
+            <if test="blsx != null  and blsx != ''"> and blsx = #{blsx}</if>
+            <if test="dbsx != null  and dbsx != ''"> and dbsx = #{dbsx}</if>
+            <if test="jzqk != null  and jzqk != ''"> and jzqk = #{jzqk}</if>
+            <if test="czwt != null  and czwt != ''"> and czwt = #{czwt}</if>
+            <if test="jjjy != null  and jjjy != ''"> and jjjy = #{jjjy}</if>
+            <if test="gzjh != null  and gzjh != ''"> and gzjh = #{gzjh}</if>
+            <if test="tbr != null  and tbr != ''"> and tbr = #{tbr}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="tbTime != null "> and tb_time = #{tbTime}</if>
+            <if test="dbType != null "> and db_type = #{dbType}</if>
+            <if test="progress != null "> and progress = #{progress}</if>
+        </where>
+    </select>
+
     <insert id="insertZsyzDbd" parameterType="ZsyzDbd" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_dbd
         <trim prefix="(" suffix=")" suffixOverrides=",">