Merge remote-tracking branch 'origin/master'

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

@@ -166,9 +166,9 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
      */
     List<Long> queryStudentVisit(@Param("organIdsStr") String organIdsStr);
 
-    List<IndexBaseMonthData> getFinancePayData();
+    List<IndexBaseMonthData> getFinancePayData(@Param("dayStr") String dayStr);
 
-    List<IndexBaseMonthData> getFinanceBalanceData();
+    List<IndexBaseMonthData> getFinanceBalanceData(@Param("dayStr") String dayStr);
 
-    List<IndexBaseMonthData> getFinanceActualData();
+    List<IndexBaseMonthData> getFinanceActualData(@Param("dayStr") String dayStr);
 }

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

@@ -195,9 +195,9 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		saveData(indexBaseMonthDataDao.getGroupCourseData(dayStr, GroupType.PRACTICE), dayStr, IndexDataType.PRACTICE_GROUP_COURSE);
 
 		//财务数据
-		saveData(indexBaseMonthDataDao.getFinancePayData(),dayStr,IndexDataType.FINANCE_PAY);
-		saveData(indexBaseMonthDataDao.getFinanceBalanceData(),dayStr,IndexDataType.FINANCE_BALANCE_AMOUNT);
-		saveData(indexBaseMonthDataDao.getFinanceActualData(),dayStr,IndexDataType.FINANCE_AMOUNT);
+		saveData(indexBaseMonthDataDao.getFinancePayData(dayStr),dayStr,IndexDataType.FINANCE_PAY);
+		saveData(indexBaseMonthDataDao.getFinanceBalanceData(dayStr),dayStr,IndexDataType.FINANCE_BALANCE_AMOUNT);
+		saveData(indexBaseMonthDataDao.getFinanceActualData(dayStr),dayStr,IndexDataType.FINANCE_AMOUNT);
 
 		return result;
 	}

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

@@ -562,11 +562,11 @@
 			course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 			LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_
-			LEFT JOIN student_visit sv ON cssp.id_=sv.object_id_
+			LEFT JOIN student_visit sv ON cssp.id_ = sv.object_id_
 		WHERE
-				cs.status_ = 'OVER'
+				cs.status_ = 'OVER' AND sv.id_ IS NULL
 			<if test="type!=null and type=='LEAVE'">
-				AND (sa.status_ = 'LEAVE' AND sa.remark_ IS NOT NULL AND sv.id_ IS NULL)
+				AND sa.status_ = 'LEAVE'
 			</if>
 			<if test="type!=null and type=='TRUANT'">
 				AND (sa.status_ = 'TRUANT' OR sa.id_ IS NULL)
@@ -618,7 +618,7 @@
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
 		</if>
-	</select>
+	</select>K
 	<select id="queryInspectionItem" resultType="java.lang.Long">
 		SELECT DISTINCT ii.id_ FROM inspection_item ii
 		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ IS NULL
@@ -649,7 +649,7 @@
 		FROM
 			inspection_item_plan
 		WHERE
-			conclusion_status_ = 1
+			conclusion_status_ = 1 AND memo_=''
 		<if test="organIds!=null and organIds.size()>0">
 			AND organ_id_ IN
 			<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -658,24 +658,24 @@
 		</if>
 	</select>
 	<select id="getFinancePayData"  resultMap="IndexBaseMonthData">
-		SELECT SUM(fe.amount_) total_num_,SUM(fe.amount_) activate_num_,SUM(fe.amount_) percent_,fe.organ_id_,DATE_FORMAT(NOW(),'%Y-%m-%d') month_ FROM financial_expenditure fe
-		WHERE DATE_FORMAT(fe.create_time_,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+		SELECT SUM(fe.amount_) total_num_,SUM(fe.amount_) activate_num_,SUM(fe.amount_) percent_,fe.organ_id_,#{dayStr} month_ FROM financial_expenditure fe
+		WHERE DATE_FORMAT(fe.create_time_,'%Y-%m-%d') = #{dayStr}
 		AND del_flag_ = 0 GROUP BY fe.organ_id_
 	</select>
 	<select id="getFinanceBalanceData" resultMap="IndexBaseMonthData">
 		SELECT spo.organ_id_,SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) total_num_,
 			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) activate_num_,
-			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) percent_,DATE_FORMAT(NOW(),'%Y-%m-%d') month_
+			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN spo.balance_payment_amount_ ELSE 0 END) percent_,#{dayStr} month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}
 		GROUP BY spo.organ_id_
 	</select>
 	<select id="getFinanceActualData" resultMap="IndexBaseMonthData">
 		SELECT spo.organ_id_,SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) total_num_,
 			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) activate_num_,
-			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) percent_,DATE_FORMAT(NOW(),'%Y-%m-%d') month_
+			   SUM(CASE WHEN spo.payment_channel_ = 'BALANCE' THEN 0 ELSE spo.actual_amount_ END) percent_,#{dayStr} month_
 		FROM student_payment_order spo
-		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+		WHERE spo.status_ = 'SUCCESS' AND DATE_FORMAT(spo.pay_time_,'%Y-%m-%d') = #{dayStr}
 		GROUP BY spo.organ_id_
 	</select>
 </mapper>

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

@@ -89,6 +89,16 @@ public class TeacherAttendanceController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "更新教师签到记录")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('teacherAttendance/update')")
+    public Object update(TeacherAttendance teacherAttendance){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        teacherAttendance.setOperator(sysUser.getId());
+        teacherAttendanceService.update(teacherAttendance);
+        return succeed();
+    }
+
     @ApiOperation(value = "获取教师考勤申述列表")
     @PostMapping("/queryTeacherAttendanceComplaints")
     @PreAuthorize("@pcs.hasPermissions('teacherAttendance/queryTeacherAttendanceComplaints')")