Merge branch 'feat-20220601-riskcontrol'

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/controller/SysJobLogController.java

@@ -60,8 +60,8 @@ public class SysJobLogController {
 	private final SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonthMapper singleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonthMapper;
 	private final SingleMemberWithoutSuchTaskTypesInSeveralMonthsMapper singleMemberWithoutSuchTaskTypesInSeveralMonthsMapper;
 
-	private final String j27 = "同一用户，连续<font color='red'>%s</font>月结算金额相同";
-	private final String j28 = "同一企业，给<font color='red'>%s</font>个用户支付相同金额";
+	private final String j27 = "同一用户，在同一企业，连续<font color='red'>%s</font>月结算金额相同";
+	private final String j28 = "同一企业，同一月份，给<font color='red'>%s</font>个及以上用户支付相同金额";
 	private final String j29 = "同一用户，连续<font color='red'>%s</font>月没有定位打卡";
 	private final String j30 = "同一用户，连续<font color='red'>%s</font>月结算金额超过<font color='red'>%s</font>金额";
 

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/task/SpringBeanTaskDemo.java

@@ -160,14 +160,6 @@ public class SpringBeanTaskDemo {
 		List<SingleMemberSettleSameAmountInSeveralMonths> result = scorePackageSettleNoteService.singleMemberSettleSameAmountInSeveralMonths(startTime, endTime);
 
 		if (CollUtil.isNotEmpty(result)) {
-			List<SingleMemberSettleSameAmountInSeveralMonths> history = singleMemberSettleSameAmountInSeveralMonthsMapper.selectList(Wrappers.<SingleMemberSettleSameAmountInSeveralMonths>lambdaQuery().between(SingleMemberSettleSameAmountInSeveralMonths::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN), LocalDateTime.of(LocalDate.now(), LocalTime.MAX)));
-			// 删除历史记录
-			log.warn("删除当期的历史记录：{}", history);
-			if (CollUtil.isNotEmpty(history)) {
-				List<Integer> ids = history.stream().mapToInt(SingleMemberSettleSameAmountInSeveralMonths::getRecordId).boxed().collect(Collectors.toList());
-				singleMemberSettleSameAmountInSeveralMonthsMapper.deleteBatchIds(ids);
-			}
-
 			result.forEach(e -> {
 				e.setPeriod(period);
 				e.setUuid(uuid);
@@ -223,14 +215,6 @@ public class SpringBeanTaskDemo {
 		List<SingleMemberSettleSameAmountInSeveralMonths> result = scorePackageSettleNoteService.singleMemberSettleAmountOverrunInSeveralMonths(startTime, endTime, limit);
 
 		if (CollUtil.isNotEmpty(result)) {
-			List<SingleMemberSettleAmountOverrunInSeveralMonths> history = singleMemberSettleAmountOverrunInSeveralMonthsMapper.selectList(Wrappers.<SingleMemberSettleAmountOverrunInSeveralMonths>lambdaQuery().between(SingleMemberSettleAmountOverrunInSeveralMonths::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN), LocalDateTime.of(LocalDate.now(), LocalTime.MAX)));
-			// 删除历史记录
-			log.warn("删除当期的历史记录：{}", history);
-			if (CollUtil.isNotEmpty(history)) {
-				List<Integer> ids = history.stream().mapToInt(SingleMemberSettleAmountOverrunInSeveralMonths::getRecordId).boxed().collect(Collectors.toList());
-				singleMemberSettleAmountOverrunInSeveralMonthsMapper.deleteBatchIds(ids);
-			}
-
 			result.forEach(e -> {
 				SingleMemberSettleAmountOverrunInSeveralMonths singleMemberSettleAmountOverrunInSeveralMonths
 						= BeanUtil.copyProperties(e, SingleMemberSettleAmountOverrunInSeveralMonths.class);
@@ -284,14 +268,6 @@ public class SpringBeanTaskDemo {
 		List<SingleMemberSettleSameAmountInSeveralMonths> result = scorePackageSettleNoteService.singleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth(startTime, endTime, memberCount);
 
 		if (CollUtil.isNotEmpty(result)) {
-			List<SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth> history = singleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonthMapper.selectList(Wrappers.<SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth>lambdaQuery().between(SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN), LocalDateTime.of(LocalDate.now(), LocalTime.MAX)));
-			// 删除历史记录
-			log.warn("删除当期的历史记录：{}", history);
-			if (CollUtil.isNotEmpty(history)) {
-				List<Integer> ids = history.stream().mapToInt(SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth::getRecordId).boxed().collect(Collectors.toList());
-				singleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonthMapper.deleteBatchIds(ids);
-			}
-
 			result.forEach(e -> {
 				SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth singleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth
 						= BeanUtil.copyProperties(e, SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth.class);
@@ -353,13 +329,6 @@ public class SpringBeanTaskDemo {
 		List<Map<String, Object>> result = wmTaskService.singleMemberWithoutSuchTaskTypesInSeveralMonths(startTime, endTime, typeList);
 
 		if (CollUtil.isNotEmpty(result)) {
-			List<SingleMemberWithoutSuchTaskTypesInSeveralMonths> history = singleMemberWithoutSuchTaskTypesInSeveralMonthsMapper.selectList(Wrappers.<SingleMemberWithoutSuchTaskTypesInSeveralMonths>lambdaQuery().between(SingleMemberWithoutSuchTaskTypesInSeveralMonths::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN), LocalDateTime.of(LocalDate.now(), LocalTime.MAX)));
-			// 删除历史记录
-			log.warn("删除当期的历史记录：{}", history);
-			if (CollUtil.isNotEmpty(history)) {
-				List<Integer> ids = history.stream().mapToInt(SingleMemberWithoutSuchTaskTypesInSeveralMonths::getRecordId).boxed().collect(Collectors.toList());
-				singleMemberWithoutSuchTaskTypesInSeveralMonthsMapper.deleteBatchIds(ids);
-			}
 
 			String types = String.join(StrUtil.COMMA, typeList.toArray(new String[0]));