浏览代码

fix: 批量财务结算当月校验回退

lixuesong 1 年之前
父节点
当前提交
c85bd59d66

+ 6 - 6
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -644,8 +644,8 @@ public class WmPayOffController {
 		List<Map<String, String>> msgList = new ArrayList<>();
 		List<Map<String, String>> msgList = new ArrayList<>();
 
 
 		// 获取当日所在月份
 		// 获取当日所在月份
-		LocalDateTime today = LocalDateTime.now();
-		int monthValue = today.getMonthValue();
+//		LocalDateTime today = LocalDateTime.now();
+//		int monthValue = today.getMonthValue();
 
 
 		for (WmScorePackageSettleInput input : inputList) {
 		for (WmScorePackageSettleInput input : inputList) {
 
 
@@ -660,10 +660,10 @@ public class WmPayOffController {
 				Map<String, Object> queryData = (Map<String, Object>) queryR.getData();
 				Map<String, Object> queryData = (Map<String, Object>) queryR.getData();
 				List<WmScorePackageSettleNote> notes = (List<WmScorePackageSettleNote>) queryData.get("notes");
 				List<WmScorePackageSettleNote> notes = (List<WmScorePackageSettleNote>) queryData.get("notes");
 
 
-				Optional<WmScorePackageSettleNote> checkMonthOpt = notes.stream().filter(note -> note.getSubTime() == null || note.getSubTime().getMonthValue() != monthValue).findAny();
-				if (checkMonthOpt.isPresent()) {
-					return R.failed("不支持结算非当月提交记录,请回退并重新提交后重试");
-				}
+//				Optional<WmScorePackageSettleNote> checkMonthOpt = notes.stream().filter(note -> note.getSubTime() == null || note.getSubTime().getMonthValue() != monthValue).findAny();
+//				if (checkMonthOpt.isPresent()) {
+//					return R.failed("不支持结算非当月提交记录,请回退并重新提交后重试");
+//				}
 
 
 				input.setNotes(notes);
 				input.setNotes(notes);
 				// 调用单个结算
 				// 调用单个结算