Merge remote-tracking branch 'origin/master'

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 ;
+		WHERE del_flag = 0 AND (des13 IS NOT NULL OR 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} ;
+		WHERE del_flag = 0 AND des13 = #{loginName} AND (des13 IS NOT NULL OR des13 != '') ;
 	</select>
 
 	<select id="getFinishSum" resultType="Map">
 		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
+		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL OR 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
+		WHERE a.del_flag = 0 AND qy_id IS NOT NULL AND (des13 IS NOT NULL OR 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 GROUP BY des1;
+		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>
 
 	<select id="getAreaInfo" resultType="Map">
-		SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 GROUP BY des1;
+		SELECT des1 FROM ly_enterprise_info WHERE del_flag = 0 AND (des13 IS NOT NULL OR des13 != '') GROUP BY des1;
 	</select>
 
 	<select id="getPersonInfo" resultType="Map">
@@ -106,7 +106,7 @@
 		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
+		WHERE a.del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
 		<if test="des1 != ''">
 			AND des1 = #{des1}
 		</if>
@@ -131,7 +131,7 @@
 			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
+		WHERE a.del_flag = 0 AND (des13 IS NOT NULL OR des13 != '')
 		<if test="des1 != ''">
 			AND des1 = #{des1}
 		</if>

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

@@ -263,7 +263,7 @@
                 <p><span style="color: red;">●</span>未完成大走访人数</p>
                 <p><span style="font-size: 20px;font-weight: 700;margin-right: 10px;">{{allSum.perUnFinishSum}}</span>人
                 </p>
-                <p>占比<span style="font-size: 12px;color: red;margin-left: 5px;">{{allSum.perUnfinish}}%</span></p>
+                <p>占比<span style="font-size: 12px;color: red;margin-left: 5px;">{{parseFloat(allSum.perUnfinish).toFixed(2)}}%</span></p>
               </div>
             </el-card>
           </el-col>
@@ -273,7 +273,7 @@
                 <p><span style="color: #0843cd;">●</span>完成大走访人数</p>
                 <p><span style="font-size: 20px;font-weight: 700;margin-right: 10px;">{{allSum.perFinishSum}}</span>人
                 </p>
-                <p>占比<span style="font-size: 12px;color: #0843cd;margin-left: 5px;">{{allSum.perAcount}}%</span></p>
+                <p>占比<span style="font-size: 12px;color: #0843cd;margin-left: 5px;">{{parseFloat(allSum.perAcount).toFixed(2)}}%</span></p>
               </div>
             </el-card>
           </el-col>
@@ -283,7 +283,7 @@
                 <p><span style="color: red;">●</span>未完成大走访企业数</p>
                 <p><span style="font-size: 20px;font-weight: 700;margin-right: 10px;">{{allSum.qyUnFinishSum}}</span>个
                 </p>
-                <p>占比<span style="font-size: 12px;color: red;margin-left: 5px;">{{allSum.qyUnfinish}}%</span></p>
+                <p>占比<span style="font-size: 12px;color: red;margin-left: 5px;">{{parseFloat(allSum.qyUnfinish).toFixed(2)}}%</span></p>
               </div>
             </el-card>
           </el-col>
@@ -293,7 +293,7 @@
                 <p><span style="color: #0843cd;">●</span>完成大走访企业数</p>
                 <p><span style="font-size: 20px;font-weight: 700;margin-right: 10px;">{{allSum.qyFinishSum}}</span>个
                 </p>
-                <p>占比<span style="font-size: 12px;color: #0843cd;margin-left: 5px;">{{allSum.qyAcount}}%</span></p>
+                <p>占比<span style="font-size: 12px;color: #0843cd;margin-left: 5px;">{{parseFloat(allSum.qyAcount).toFixed(2)}}%</span></p>
               </div>
             </el-card>
           </el-col>
@@ -303,7 +303,7 @@
                 <p><span style="color: red;">●</span>未办结问题数</p>
                 <p><span style="font-size: 20px;font-weight: 700;margin-right: 10px;">{{allSum.queUnFinishSum}}</span>个
                 </p>
-                <p>占比<span style="font-size: 12px;color: red;margin-left: 5px;">{{allSum.queUnfinish}}%</span></p>
+                <p>占比<span style="font-size: 12px;color: red;margin-left: 5px;">{{parseFloat(allSum.queUnfinish).toFixed(2)}}%</span></p>
               </div>
             </el-card>
           </el-col>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="page">
-    <el-dialog title="问题信息" :close-on-click-modal="false" v-dialogDrag :visible.sync="visible">
+    <el-dialog width="80%" title="问题信息" :close-on-click-modal="false" v-dialogDrag :visible.sync="visible">
       <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm"
         @keyup.enter.native="refreshList()" @submit.native.prevent>
         <!-- 搜索框-->