进度统计和服务对接权限限制

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

@@ -292,30 +292,6 @@ public class DzfQuestionController {
 	public ResponseEntity<List<List<HashMap<String, Object>>>> getReportFinishVisit(String start, String end) throws Exception {
 
 //		UserDTO userDTO = UserUtils.getCurrentUserDTO();
-//		//企业（能看到自己企业的问题）
-//		if(userDTO.getRoleIds().equals("38a14f1f42ed424eab4cb5d489596b0d")){
-//			EnterpriseInfoDTO ei=enterpriseInfoService.findByUserid ( userDTO.getLoginName());
-//			dzfQuestionDTO.setQyId(ei.getId());
-//		}
-//
-//		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (dzfQuestionDTO, DzfQuestionDTO.class);
-//		//挂钩干部（能看到对应企业）
-//		if(userDTO.getRoleIds().equals("1915280292672946177")){
-//			queryWrapper.eq ("ei.bz6", userDTO.getLoginName() ); // 排除已经删除
-//		}
-//		//办公室(能看到所有提交的问题)
-//		if(userDTO.getRoleIds().equals("1910175386924417025")){
-//			queryWrapper.ne ("a.states", "0" ); // 排除已经删除
-//		}
-//		//办理部门
-//		if(userDTO.getRoleIds().equals("1910175949166673921")){
-//			queryWrapper.eq ("c.des3", userDTO.getLoginName() ); // 筛选流程中涉及到自己的
-//			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage2 (page, queryWrapper);
-//			return ResponseEntity.ok (result);
-//		}else{
-//			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage (page, queryWrapper);
-//			return ResponseEntity.ok (result);
-//		}
 		List<List<HashMap<String, Object>>> result = dzfQuestionService.getFinish (start, end);
 		return ResponseEntity.ok (result);
 	}

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

@@ -72,26 +72,26 @@
 	</select>
 
 	<select id="getProgressMonth" resultType="Map"  parameterType="String">
-		SELECT COUNT(*) allque, COUNT(IF(states != 0 or states IS NULL ,1,NULL )) AS unfinish
-		FROM dzf_question_detil WHERE del_flag = 0
+		SELECT COUNT(*) allque, COUNT(CASE WHEN states != 0 THEN 1 END) AS unfinish
+		FROM dzf_question_detil WHERE del_flag = 0 AND states IS NOT NULL
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{start} AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{end};
 	</select>
 
 	<select id="getProgressYear" resultType="Map" parameterType="String">
 		SELECT COUNT(*) allque, COUNT(IF(states = 0,1,NULL )) AS finish
-		FROM dzf_question_detil WHERE del_flag = 0
+		FROM dzf_question_detil WHERE del_flag = 0 AND states IS NOT NULL
 		AND DATE_FORMAT(create_date,'%Y') = DATE_FORMAT(#{end},'%Y');
 	</select>
 
 	<select id="getProgressMonth2" resultType="Map"  parameterType="String">
-		SELECT COUNT(*) allque, COUNT(IF(states != 0 or states IS NULL ,1,NULL )) AS unfinish
+		SELECT COUNT(*) allque, COUNT(CASE WHEN states != 0 THEN 1 END) AS unfinish
 		FROM
 		(SELECT record_id FROM dzf_question_op_record
 		WHERE del_flag = 0 AND FIND_IN_SET(#{userName},des3)
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{start}  AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{end}
 		GROUP BY record_id) b
 		LEFT JOIN dzf_question_detil a ON a.id = b.record_id
-		WHERE del_flag = 0;
+		WHERE del_flag = 0 AND states IS NOT NULL;
 	</select>
 
 	<select id="getProgressYear2" resultType="Map" parameterType="String">
@@ -102,7 +102,7 @@
 		AND DATE_FORMAT(create_date,'%Y') = DATE_FORMAT(#{end},'%Y')
 		GROUP BY record_id) b
 		LEFT JOIN dzf_question_detil a ON a.id = b.record_id
-		WHERE del_flag = 0;
+		WHERE del_flag = 0 AND states IS NOT NULL;
 	</select>
 
 	<select id="findList3" resultType="com.jeeplus.question.service.dto.DzfQuestionDTO" >
@@ -110,9 +110,9 @@
 		<include refid="dzfQuestionColumns"/>
 		FROM dzf_question a
 		<include refid="dzfQuestionJoins2"/>
-		WHERE a.del_flag = 0 AND b.del_flag = 0
+		WHERE a.del_flag = 0 AND b.del_flag = 0 AND b.states IS NOT NULL
 		<if test="state == 999">
-			AND (b.states != 0 OR b.states IS NULL)
+			AND (b.states != 0)
 		</if>
 		<if test="state != 999">
 			AND b.states = #{state}
@@ -132,7 +132,7 @@
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{start}  AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{end}
 		GROUP BY record_id) b
 		LEFT JOIN dzf_question_detil a ON a.id = b.record_id
-		WHERE del_flag = 0
+		WHERE del_flag = 0 AND a.states IS NOT NULL
 		<if test="state == 999">
 			AND (a.states != 0 OR a.states IS NULL)
 		</if>

jp-mobile/pages/progress/ProgressQuestionList.vue

@@ -61,11 +61,13 @@
 				curWord: "", //当前搜索关键词
 				range: [
 				          { value: 999, text: "全部" },
-				          { value: 1, text: "反馈大走访" },
-				          { value: 2, text: "正在办理" },
-						  { value: 3, text: "难以化解" },
-						  { value: 4, text: "持续跟踪" },
-						  { value: 5, text: "提请会办" },
+						  { value: 1, text: "提交" },
+				          { value: 4, text: "反馈大走访" },
+				          { value: 5, text: "正在办理" },
+						  { value: 6, text: "难以化解" },
+						  { value: 7, text: "持续跟踪" },
+						  { value: 8, text: "提请会办" },
+						  { value: 9, text: "交办" },
 				        ],
 				dataList: [], // 数据列表
 				modalName: null,