From 9ddf06bee3dbd1dde785e2ac7be808c8ee22d56d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 23 Aug 2021 08:58:44 +0800
Subject: [PATCH] 1.首页接口调整

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 1e16a8e..9c88228 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -26,6 +26,8 @@
         <result column="representativecell" property="representativecell"/>
         <result column="contacts" property="contacts"/>
         <result column="contactscell" property="contactscell"/>
+        <result column="businessLicense" property="businessLicense"/>
+        <result column="licence" property="licence"/>
     </resultMap>
 
 
@@ -101,7 +103,7 @@
         LEFT JOIN blade_dept d ON d.id= u.dept_id
         LEFT JOIN sys_jurisdiction j ON j.id= u.jurisdiction
         WHERE
-        hold = 1
+        hold = 2
         <if test="jurisdiction!=null and jurisdiction!=''">
             and u.jurisdiction =#{jurisdiction}
         </if>
@@ -539,7 +541,7 @@
         jurisdiction
         FROM blade_user
         WHERE role_id = '1412226235153731586'
-        AND hold = 0
+        AND hold = 1
         AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
         GROUP BY dept_id,
         jurisdiction
@@ -551,7 +553,7 @@
         jurisdiction
         FROM blade_user
         WHERE role_id = '1412226235153731586'
-        AND hold = 0
+        AND hold = 1
         AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
         GROUP BY dept_id,
         jurisdiction
@@ -780,7 +782,7 @@
         GROUP BY
         i.departmentid
         )
-        AND role_id='1412226235153731586' AND hold=0
+        AND role_id='1412226235153731586' AND hold=1
         <if test="deptid!=null and deptid!=''">
             and dept_id =#{deptid}
         </if>
@@ -861,17 +863,17 @@
         FROM blade_user u
         LEFT JOIN blade_dept d ON d.id = u.dept_id
         LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
-        WHERE u.examination_type = 1
+        WHERE u.examination_type = 1 and u.is_deleted=0
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
             and u.jurisdiction =#{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
             and u.dept_id =#{deptid}
         </if>
-        <if test="type!=null and type=='1'">
-            and to_days(u.update_time) = to_days(now());
+        <if test="type!=null and type=='1'.toString()">
+            and to_days(u.update_time) = to_days(now())
         </if>
-        <if test="type!=null and type=='2'">
+        <if test="type!=null and type=='2'.toString()">
             and DATE_FORMAT(u.update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         </if>
         GROUP BY d.dept_name,u.real_name,
@@ -892,10 +894,10 @@
         <if test="deptid!=null and deptid!=''">
             and u.departmentid =#{deptid}
         </if>
-        <if test="type!=null and type=='1'">
-            and to_days(u.time) = to_days(now());
+        <if test="type!=null and type=='1'.toString()">
+            and to_days(u.time) = to_days(now())
         </if>
-        <if test="type!=null and type=='2'">
+        <if test="type!=null and type=='2'.toString()">
             and DATE_FORMAT(u.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         </if>
         GROUP BY d.dept_name,
@@ -986,7 +988,7 @@
         blade_user
         WHERE
         role_id = '1412226235153731586'
-        AND hold=0
+        AND hold=1
         GROUP BY
         dept_id,
         jurisdiction
@@ -1135,7 +1137,7 @@
         jurisdiction
         FROM blade_user
         WHERE role_id = '1412226235153731586'
-        AND hold = 0
+        AND hold = 1
         GROUP BY dept_id,
         jurisdiction
         ) D ON A.departmentid = D.dept_id
@@ -1161,8 +1163,7 @@
             and J.enterpriseName like concat('%', #{enterpriseName},'%')
         </if>
         GROUP BY J.enterpriseName,
-        J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction limit
-        #{current},#{size};
+        J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction
     </select>
 
     <!--公司经济情况进入图表-->
@@ -1216,7 +1217,6 @@
             and J.enterpriseName like concat('%', #{enterpriseName},'%')
         </if>
         GROUP BY J.departmentid, J.enterpriseName, J.jurisdiction, J.jurname, J.pcnum, J.sbcount, J.sbnum, J.zb, J.znum
-        limit #{current},#{size};
     </select>
 
 
@@ -1232,6 +1232,7 @@
         SELECT
         i.enterpriseName,
         i.departmentid,
+        i.jurisdiction,
         j.dept_name
         FROM
         sys_information i
@@ -1297,7 +1298,6 @@
         <if test="fid!=null and fid!=''">
             and di.dispatcher_unit_id=#{fid}
         </if>
-        limit #{current},#{size};
     </select>
     <!--服务单位下拉-->
     <select id="selectFw" resultType="java.util.HashMap">

--
Gitblit v1.9.3