优化首页数据

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/lyservice/mapper/xml/LyServiceMapper.xml

@@ -48,19 +48,19 @@
 
 	<select id="getAllSum" resultType="Map">
 		SELECT count(id) allqy,COUNT(DISTINCT des13) allper FROM ly_enterprise_info
-		WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '') ;
+		WHERE del_flag = 0 AND (des13 IS NOT NULL AND des13 != '') ;
 	</select>
 
 	<select id="getAllSum2" resultType="Map">
 		SELECT count(id) allqy,COUNT(DISTINCT des13) allper FROM ly_enterprise_info
-		WHERE del_flag = 0 AND des13 = #{loginName} AND (des13 IS NOT NULL OR des13 != '') ;
+		WHERE del_flag = 0 AND des13 = #{loginName} AND (des13 IS NOT NULL AND des13 != '') ;
 	</select>
 
 	<select id="getFinishSum" resultType="Map">
-		SELECT count(a.id) finishqy,COUNT(DISTINCT des13) finishper
+		SELECT COUNT(DISTINCT a.id) finishqy,COUNT(DISTINCT des13) finishper
 		FROM ly_enterprise_info a
 		LEFT JOIN ly_service b ON a.id = b.qy_id
-		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL OR des13 != '')
+		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL AND des13 != '')
 		AND DATE_FORMAT(b.create_date, '%Y-%m-%d') >= #{start} AND DATE_FORMAT(b.create_date, '%Y-%m-%d') &lt;= #{end};
 	</select>
 
@@ -68,7 +68,7 @@
 		SELECT count(a.id) finishqy,COUNT(DISTINCT des13) finishper
 		FROM ly_enterprise_info a
 		LEFT JOIN ly_service b ON a.id = b.qy_id
-		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL OR des13 != '')
+		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL AND des13 != '')
 		AND des13 = #{loginName}
 		AND DATE_FORMAT(b.create_date, '%Y-%m-%d') >= #{start} AND DATE_FORMAT(b.create_date, '%Y-%m-%d') &lt;= #{end};
 	</select>
@@ -91,11 +91,11 @@
 	</select>
 
 	<select id="getPerson" resultType="Map">
-		SELECT des1, COUNT(DISTINCT des13) AS perNum FROM ly_enterprise_info WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '') GROUP BY des1;
+		SELECT des1, COUNT(DISTINCT des13) AS perNum FROM ly_enterprise_info WHERE del_flag = 0 AND (des13 IS NOT NULL AND des13 != '') GROUP BY des1;
 	</select>
 
 	<select id="getAreaInfo" resultType="Map">
-		SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '') GROUP BY des1;
+		SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 AND (des13 IS NOT NULL AND des13 != '') GROUP BY des1;
 	</select>
 
 	<select id="getPersonInfo" resultType="Map">
@@ -106,43 +106,46 @@
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{endTime}
 		</if>
 		) b ON a.id = b.qy_id
-		WHERE a.del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
+		WHERE a.del_flag = 0 AND (des13 IS NOT NULL AND des13 != '')
 		<if test="des1 != ''">
 			AND des1 = #{des1}
 		</if>
 		<if test="name != ''">
 			AND name LIKE CONCAT('%', #{name}, '%')
 		</if>
+		GROUP BY des13
 		<if test="state == 1">
-			AND b.id IS NULL
+			HAVING sum = 0
 		</if>
 		<if test="state == 2">
-			AND b.id IS NOT NULL
+			HAVING sum > 0
 		</if>
-		GROUP BY des13
 		ORDER BY sum DESC;
 	</select>
 
 	<select id="getCompanyInfo" resultType="Map">
-		SELECT b.id AS sum,des13,des14,des1,name FROM ly_enterprise_info a
+		SELECT COUNT(DISTINCT b.id) AS sum,des13,des14,des1,name FROM
+		(SELECT id, des13,des14,des1,name,del_flag FROM ly_enterprise_info a
+		WHERE a.del_flag = 0 AND des13 IS NOT NULL AND des13 != '')  a
 		LEFT JOIN
 		(SELECT * FROM ly_service WHERE del_flag = 0
 		<if test="beginTime != ''">
 			AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{beginTime} AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{endTime}
 		</if>
 		) b ON a.id = b.qy_id
-		WHERE a.del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
+		WHERE a.del_flag = 0 AND (des13 IS NOT NULL AND des13 != '')
 		<if test="des1 != ''">
 			AND des1 = #{des1}
 		</if>
 		<if test="name != ''">
 			AND name LIKE CONCAT('%', #{name}, '%')
 		</if>
+		GROUP BY a.id
 		<if test="state == 1">
-			AND b.id IS NULL
+			HAVING sum = 0
 		</if>
 		<if test="state == 2">
-			AND b.id IS NOT NULL
+			HAVING sum > 0
 		</if>
 		ORDER BY sum DESC;
 	</select>

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/xml/DzfQuestionMapper.xml

@@ -130,9 +130,9 @@
 	<select id="findList3" resultType="com.jeeplus.question.service.dto.DzfQuestionDTO" >
 		SELECT
 		<include refid="dzfQuestionColumns"/>
-		FROM dzf_question a
-		<include refid="dzfQuestionJoins2"/>
-		WHERE a.del_flag = 0 AND b.del_flag = 0 AND b.states IS NOT NULL
+		FROM dzf_question_detil b
+		LEFT JOIN dzf_question a ON b.qid = a.id
+		WHERE a.del_flag = 0 AND b.del_flag = 0 AND b.states IS NOT NULL AND b.states != ''
 		<if test="state == 999">
 			AND b.states != 0
 		</if>

jp-ui/src/views/modules/sys/dashboard/analysis/questionInfo.vue

@@ -26,7 +26,6 @@
           ref="dzfQuestionTable" show-header-overflow show-overflow highlight-hover-row :menu-config="{}"
           :print-config="{}" :data="dataList" :checkbox-config="{}">
           <vxe-column type="seq" width="40"></vxe-column>
-          <vxe-column type="checkbox" width="40px"></vxe-column>
           <vxe-column field="" title="企业名称">
             <template slot-scope="scope">
               {{scope.row.qyName }}
@@ -120,7 +119,7 @@
         tablePage: {
           total: 0,
           currentPage: 1,
-          pageSize: 10,
+          pageSize: 10000,
           orders: [{
             column: 'a.create_date',
             asc: false