团队重构

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@@ -9,7 +9,6 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.core.utils.ResponseHelper;
 import com.mdp.msg.client.PushNotifyMsgService;
 import com.mdp.mybatis.PageUtils;
-import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
@@ -19,7 +18,10 @@ import com.xm.core.service.*;
 import com.xm.core.service.push.XmPushMsgService;
 import com.xm.core.vo.XmGroupVo;
 import com.xm.core.vo.XmQuestionVo;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -132,7 +134,13 @@ public class XmQuestionController {
 		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAgeDist(xmQuestion);
 		return ResponseHelper.ok("ok","成功",datas);
 	}
-
+	@RequestMapping(value="/getXmQuestionRetestDist",method=RequestMethod.GET)
+	public Map<String,Object> getXmQuestionRetestDist( @ApiIgnore @RequestParam Map<String,Object> xmQuestion){
+		User user=LoginUtils.getCurrentUserInfo();
+		xmQuestion.put("branchId",user.getBranchId());
+		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionRetestDist(xmQuestion);
+		return ResponseHelper.ok("ok","成功",datas);
+	}
 	@RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET)
 	public Map<String,Object> getXmQuestionSort( @ApiIgnore @RequestParam Map<String,Object> xmQuestion){
 		User user=LoginUtils.getCurrentUserInfo();

xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

@@ -6,18 +6,18 @@ import com.mdp.core.service.BaseService;
 import com.mdp.core.utils.BaseUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
-import com.xm.core.entity.XmProduct;
-import com.xm.core.entity.XmProject;
 import com.xm.core.entity.XmQuestion;
 import com.xm.core.entity.XmQuestionHandle;
 import com.xm.core.vo.XmQuestionVo;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
@@ -220,5 +220,8 @@ public class XmQuestionService extends BaseService {
 		return "Q"+sequenceService.getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
 	}
 
+    public List<Map<String, Object>> getXmQuestionRetestDist(Map<String, Object> xmQuestion) {
+		return super.selectList("getXmQuestionRetestDist",xmQuestion);
+    }
 }
 

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

@@ -69,6 +69,24 @@
 		</where>
 		group by ${groupBy}
 	</select>
+
+
+	<select id="getXmQuestionRetestDist" parameterType="HashMap" resultType="HashMap">
+
+		select count(*) as bugs_num,retimes from
+		(
+		SELECT count(*) as retimes,res.question_id FROM xm_question_handle res
+		<where>
+			<include refid="whereForMap"></include>
+			<include refid="where"></include>
+			and handle_status='9'
+		</where>
+
+		group by res.question_id ) as ret
+		group by ret.retimes
+		order by retimes desc
+	</select>
+
 	<!--结束 自定义sql函数区域-->