优化首页数据展示

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/controller/DzfQuestionController.java

@@ -365,7 +365,10 @@ public class DzfQuestionController {
 		if(userDTO.getRoleIds().equals("1910175949166673921")){
 			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage4 (page, state,start,end,userDTO.getLoginName());
 			return ResponseEntity.ok (result);
-		}else{
+		} else if (userDTO.getRoleIds().equals("1910175386924417025")) {
+			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage5 (page, state,start,end);
+			return ResponseEntity.ok (result);
+		} else{
 			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage3 (page, state,start,end);
 			return ResponseEntity.ok (result);
 		}

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

@@ -45,6 +45,7 @@ public interface DzfQuestionMapper extends BaseMapper<DzfQuestion> {
 
     IPage<DzfQuestionDTO> findList3(Page<DzfQuestionDTO> page, String state,String start,String end);
     IPage<DzfQuestionDTO> findList4(Page<DzfQuestionDTO> page, String state,String start,String end, String loginName);
+    IPage<DzfQuestionDTO> findList5(Page<DzfQuestionDTO> page, String state, String start, String end);
 
     List<HashMap<String, Object>> getFinishList(String start, String end);
 
@@ -58,4 +59,6 @@ public interface DzfQuestionMapper extends BaseMapper<DzfQuestion> {
     List<HashMap<String, Object>> getContinueList(String start, String end);
 
     List<HashMap<String, Object>> getContinueList2(String start, String end, String loginName);
+
+
 }

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

@@ -191,6 +191,22 @@
 		WHERE a.del_flag = 0 AND a.id IS NOT NULL;
 	</select>
 
+	<select id="findList5" resultType="com.jeeplus.question.service.dto.DzfQuestionDTO" >
+		SELECT
+		<include refid="dzfQuestionColumns"/>
+		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 AND b.states != 1 AND b.states != 4 AND b.states != 8
+		</if>
+		<if test="state != 999">
+			AND b.states = #{state}
+		</if>
+		AND DATE_FORMAT(b.create_date, '%Y-%m-%d') >= #{start}  AND DATE_FORMAT(b.create_date, '%Y-%m-%d') &lt;= #{end}
+		<!--		group by a.id-->
+	</select>
+
 	<select id="getFinishList" resultType="Map">
 		SELECT a.*,c.qy_name,c.officer,c.qy_sd,b.q_type,DATE_FORMAT(b.create_date, '%Y-%m-%d') AS subtime,b.des FROM (
 		SELECT a.* FROM

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/service/DzfQuestionService.java

@@ -170,6 +170,9 @@ public class DzfQuestionService extends ServiceImpl<DzfQuestionMapper, DzfQuesti
 	public IPage<DzfQuestionDTO> findPage4(Page<DzfQuestionDTO> page, String state,String start,String end, String loginName) {
 		return  baseMapper.findList4 (page, state,start,end,loginName);
 	}
+	public IPage<DzfQuestionDTO> findPage5(Page<DzfQuestionDTO> page, String state, String start, String end) {
+		return  baseMapper.findList5 (page, state,start,end);
+	}
 
 	public List<List<HashMap<String, Object>>> getFinish(String start, String end) {
 		// 获取已办结问题
@@ -396,4 +399,6 @@ public class DzfQuestionService extends ServiceImpl<DzfQuestionMapper, DzfQuesti
 		allList.put("three",continueList3);
 		return allList;
 	}
+
+
 }

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

@@ -85,14 +85,14 @@
             value: 999,
             text: "未办结全部"
           },
-          // {
-          //   value: 1,
-          //   text: "提交"
-          // },
-          // {
-          //   value: 4,
-          //   text: "反馈大走访"
-          // },
+          {
+            value: 1,
+            text: "提交"
+          },
+          {
+            value: 4,
+            text: "反馈大走访"
+          },
           {
             value: 5,
             text: "正在办理"
@@ -105,10 +105,10 @@
             value: 7,
             text: "持续跟踪"
           },
-          // {
-          //   value: 8,
-          //   text: "提请会办"
-          // },
+          {
+            value: 8,
+            text: "提请会办"
+          },
           {
             value: 9,
             text: "交办"
@@ -127,6 +127,15 @@
         },
       }
     },
+    mounted() {
+      const user = JSON.parse(localStorage.getItem("user"));
+      if(user.roleIds === '1910175386924417025'){
+        this.range = this.range.filter(item => {
+          return item.value != 1 && item.value != 4 && item.value != 8
+        })
+      }
+
+    },
     methods: {
       init(state, date) {
         if (state == 1) {