Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -150,21 +150,21 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      * @param organIdsStr
      * @return
      */
-    List<Long> queryInspectionItem(@Param("organIdsStr") String organIdsStr);
+    int queryInspectionItem(@Param("organIdsStr") String organIdsStr);
 
     /**
      * 乐团巡查任务未提交
      * @param organIdsStr
      * @return
      */
-    List<Long> queryInspectionItemPlan(@Param("organIdsStr") String organIdsStr);
+    int queryInspectionItemPlan(@Param("organIdsStr") String organIdsStr);
 
     /**
      * 未完成的回访任务
      * @param organIdsStr
      * @return
      */
-    List<Long> queryStudentVisit(@Param("organIdsStr") String organIdsStr);
+    int queryStudentVisit(@Param("organIdsStr") String organIdsStr);
 
     List<IndexBaseMonthData> getFinancePayData(@Param("dayStr") String dayStr);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionItemPlanQueryInfo.java

@@ -41,6 +41,17 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "ids",required = false)
     private String ids;
 
+    @ApiModelProperty(value = "乐团巡查任务未提交：INSPECTION_ITEM_PLAN 乐团巡查事项异常：MUSIC_PATROL_ITEM",required = false)
+    private String searchType;
+
+    public String getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
     public Date getStartTime() {
         return startTime;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionQueryInfo.java

@@ -26,7 +26,18 @@ public class InspectionQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "ids",required = false)
     private String ids;
 
-	public String getOrganId() {
+    @ApiModelProperty(value = "查询类型 INSPECTION_ITEM 乐团巡查任务未计划,回访任务未完成 STUDENT_VISIT",required = false)
+    private String searchType;
+
+    public String getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(String searchType) {
+        this.searchType = searchType;
+    }
+
+    public String getOrganId() {
 		return organId;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupQuitQueryInfo.java

@@ -7,6 +7,16 @@ public class MusicGroupQuitQueryInfo extends QueryInfo {
 
     private String ids;
 
+    private Boolean visitFlag;
+
+    public Boolean getVisitFlag() {
+        return visitFlag;
+    }
+
+    public void setVisitFlag(Boolean visitFlag) {
+        this.visitFlag = visitFlag;
+    }
+
     public String getOrganId() {
         return organId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -405,14 +405,14 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
 			threeChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
 
-			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM, IndexErrorType.INSPECTION_ITEM.getMsg(),inspectionItem.size(), inspectionItem));
+			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
+			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM, IndexErrorType.INSPECTION_ITEM.getMsg(),inspectionItem, null));
 
-			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM_PLAN, IndexErrorType.INSPECTION_ITEM_PLAN.getMsg(),inspectionItemPlan.size(), inspectionItemPlan));
+			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
+			threeChild.add(new IndexErrInfoDto(IndexErrorType.INSPECTION_ITEM_PLAN, IndexErrorType.INSPECTION_ITEM_PLAN.getMsg(),inspectionItemPlan, null));
 
-			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
-			threeChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_VISIT, IndexErrorType.STUDENT_VISIT.getMsg(),studentVisit.size(), studentVisit));
+			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
+			threeChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_VISIT, IndexErrorType.STUDENT_VISIT.getMsg(),studentVisit, null));
 
 			three.setNum(threeChild.stream().mapToInt(IndexErrInfoDto::getNum).sum());
 			three.setResult(threeChild);
@@ -528,20 +528,20 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 		}
 		if(!flag3){
-			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
-			if(inspectionItem.size() > 0){
+			int inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
+			if(inspectionItem > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
-			if(inspectionItemPlan.size() > 0){
+			int inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
+			if(inspectionItemPlan > 0){
 				flag3 = true;
 			}
 		}
 		if(!flag3){
-			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
-			if(studentVisit.size() > 0){
+			int studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
+			if(studentVisit > 0){
 				flag3 = true;
 			}
 		}

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -617,22 +617,22 @@
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
 		</if>
 	</select>
-	<select id="queryInspectionItem" resultType="java.lang.Long">
-		SELECT DISTINCT ii.id_ FROM inspection_item ii
+	<select id="queryInspectionItem" resultType="int">
+		SELECT COUNT(DISTINCT ii.id_) FROM inspection_item ii
 		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
 		</if>
 	</select>
-	<select id="queryInspectionItemPlan" resultType="java.lang.Long">
-		SELECT DISTINCT iip.id_ FROM inspection_item_plan iip
+	<select id="queryInspectionItemPlan" resultType="int">
+		SELECT COUNT(DISTINCT iip.id_) FROM inspection_item_plan iip
 		WHERE iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d')
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(iip.organ_id_,#{organIdsStr})
 		</if>
 	</select>
-	<select id="queryStudentVisit" resultType="java.lang.Long">
-		SELECT DISTINCT ii.id_ FROM inspection_item ii
+	<select id="queryStudentVisit" resultType="int">
+		SELECT COUNT(DISTINCT ii.id_) FROM inspection_item ii
 		WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
 		AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
 		WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(ii.create_time_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))

mec-biz/src/main/resources/config/mybatis/InspectionItemMapper.xml

@@ -166,6 +166,16 @@
 
     <sql id="queryPageSql">
         <where>
+            <if test="searchType != null and searchType != ''">
+                <if test="searchType == 'INSPECTION_ITEM'">
+                    AND ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
+                </if>
+                <if test="searchType == 'STUDENT_VISIT'">
+                    AND ii.item_ = 'VISIT' AND ii.memo_ =''
+                    AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
+                    WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(ii.create_time_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
+                </if>
+            </if>
             <if test="organId != null">
                 AND FIND_IN_SET(ii.organ_id_,#{organId})
             </if>

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -160,8 +160,13 @@
             <if test='hasSubmit != null and hasSubmit.toString()=="0".toString()'>
                 AND iip.status_ = 0
             </if>
-            <if test="ids != null">
-                AND FIND_IN_SET(iip.id_,#{ids})
+            <if test="searchType != null and searchType != ''">
+                <if test="searchType == 'MUSIC_PATROL_ITEM'">
+                    AND iip.conclusion_status_ = 1 AND iip.memo_=''
+                </if>
+                <if test="searchType == 'INSPECTION_ITEM_PLAN'">
+                    AND iip.status_ = 0 AND iip.memo_ = '' AND DATE_FORMAT(iip.plan_start_,'%Y-%m-%d') &lt; DATE_FORMAT(NOW(),'%Y-%m-%d')
+                </if>
             </if>
             <if test="startTime != null">
                 AND iip.plan_start_ >= #{startTime}

mec-biz/src/main/resources/config/mybatis/MusicGroupQuitMapper.xml

@@ -103,6 +103,11 @@
             <if test="ids != null and ids != ''">
                 FIND_IN_SET(mgq.id_,#{ids})
             </if>
+            <if test="visitFlag != null">
+                <if test="visitFlag == 0">
+                    AND mg.status_='PROGRESS' AND mgq.status_='PROCESSING'
+                </if>
+            </if>
             <if test="organId != null and organId != ''">
                 FIND_IN_SET(mg.organ_id_,#{organId})
             </if>

mec-web/src/main/java/com/ym/mec/web/controller/InspectionItemPlanController.java

@@ -65,7 +65,7 @@ public class InspectionItemPlanController extends BaseController {
     }
 
     @ApiOperation(value = "巡查任务事项日程列表")
-    @GetMapping("/queryPage")
+    @RequestMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('inspectionItemPlan/queryPage')")
     public HttpResponseResult<PageInfo<InspectionItemPlan>> queryPage(InspectionItemPlanQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();