Browse Source

feat: 临时放开测试服务商用于调试

lixuesong 3 ngày trước cách đây
mục cha
commit
ffcb27d3e9

+ 5 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScorePackageExportController.java

@@ -53,15 +53,16 @@ public class WmScorePackageExportController {
 		LocalDate endDate = params.getEndDate();
 
 		LocalDate today = LocalDate.now();
-		if(endDate == null) {
-			// 当月的最后一天
-			endDate = LocalDate.of(today.getYear(),  today.getMonth(), today.lengthOfMonth());
-		}
 		if(startDate == null) {
 			// 当月的第一天
 			startDate = LocalDate.of(today.getYear(),  today.getMonth(), 1);
 		}
 
+		if(endDate == null) {
+			// 当月的最后一天
+			endDate = LocalDate.of(startDate.getYear(),  startDate.getMonth(), startDate.lengthOfMonth());
+		}
+
 		return R.ok(scorePackageExportService.asyncExport(user, roles, startDate, endDate));
 	}
 }

+ 5 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskExportController.java

@@ -53,15 +53,16 @@ public class WmTaskExportController {
 		LocalDate endDate = params.getEndDate();
 
 		LocalDate today = LocalDate.now();
-		if(endDate == null) {
-			// 当月的最后一天
-			endDate = LocalDate.of(today.getYear(),  today.getMonth(), today.lengthOfMonth());
-		}
 		if(startDate == null) {
 			// 当月的第一天
 			startDate = LocalDate.of(today.getYear(),  today.getMonth(), 1);
 		}
 
+		if(endDate == null) {
+			// 当月的最后一天
+			endDate = LocalDate.of(startDate.getYear(),  startDate.getMonth(), startDate.lengthOfMonth());
+		}
+
 		return R.ok(taskDetailExportService.asyncExport(user, roles, startDate, endDate));
 	}
 }

+ 1 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageExportServiceImpl.java

@@ -140,7 +140,6 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 		Set<Integer> operatorRoleIds = scope.getOperatorRoleIds();
 		List<String> cPkgIds = scope.getCPkgIds();
 		List<WmScorePackage> childrenPkgs = scope.getChildrenPkgs();
-		Map<String, List<String>> parentId2PkgMap = scope.getParentId2PkgMap();
 		Map<Integer, List<WmPackageTaskTypeQty>> pttMap = scope.getPttMap();
 
 		// 获取区域的上级包
@@ -583,7 +582,7 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 				.selectList(Wrappers.<SysDept>lambdaQuery()
 						.eq(SysDept::getDelFlag, CommonConstants.STATUS_NORMAL))
 				.stream()
-				.filter(d -> !ignoreIds.contains(d.getDeptId()))
+//				.filter(d -> !ignoreIds.contains(d.getDeptId())) todo 临时注释用于调试
 				.collect(Collectors.toList());
 
 		if (CollUtil.isEmpty(depts)) {