2022年9月30日 17:30

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProject.java

@@ -48,13 +48,19 @@ public class ServiceProject  implements Serializable {
 	private String salesName;
 	//收款方式
 	private String paymentType;
-	//应收金额
+	/**
+	 * 应收金额
+	 */
 	private BigDecimal debitAmount;
 	//预收金额
 	private BigDecimal advanceAmount;
-	//已收金额
+	/**
+	 * 已收金额
+	 */
 	private BigDecimal settlmentAmount;
-	//未收金额
+	/**
+	 * 未收金额
+	 */
 	private BigDecimal balanceAmount;
 	//开始时间
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -919,7 +919,7 @@ public class ProjectController {
 						   @RequestParam(name = "actualDateStart", required = false) String actualDateStart,
 						   @RequestParam(name = "actualDateEnd", required = false) String actualDateEnd,
 						   @RequestParam(name = "userName", required = false) String userName,
-						   @RequestParam(name = "status", required = false) String status,
+						   @RequestParam(name = "taskStatus", required = false) String taskStatus,
 						   @RequestParam(name = "branch") String branch
 	) {
 		LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -940,10 +940,22 @@ public class ProjectController {
 
 		itemLambdaQueryWrapper.orderByDesc(ServiceProjectItem::getUserid)
 			.eq(ServiceProjectItem::getIsDeleted, 0)
-			.eq(StringUtils.isNotBlank(status), ServiceProjectItem::getStatus, status)
+			.eq(StringUtils.isNotBlank(taskStatus), ServiceProjectItem::getTaskStatus, taskStatus)
 			.eq(ServiceProjectItem::getBranch, branch);
 		Page<ServiceProjectItem> page = new Page<>(current, size);
 		IPage<ServiceProjectItem> iPage = serviceProjectItemService.page(page, itemLambdaQueryWrapper);
+		String deptIds = "";//部门
+		String userIds = "";//承做人
+		for (ServiceProjectItem projectItem : iPage.getRecords()){
+			if (ObjectUtil.isNotEmpty(projectItem.getDeptid())){
+				deptIds = deptIds + projectItem.getDeptid() + ",";
+			}
+			if (ObjectUtil.isNotEmpty(projectItem.getUserid())){
+				userIds = userIds +projectItem.getUserid() + ",";
+			}
+		}
+		R<List<Dept>> deptList = iSysClient.selectByDeptIds(deptIds);
+		List<User> userList = userClient.selectUserIds(userIds);
 		if (!CollectionUtils.isEmpty(iPage.getRecords())) {
 			String[] str = new String[]{"录入", "已请核", "审核中", "审核通过", "正在结算", "结算完成", "", "追加", "退费"};
 			iPage.getRecords().forEach(e -> {
@@ -956,15 +968,16 @@ public class ProjectController {
 					e.setCornName(corpMessage.getData().getCname());
 				}
 				//任务部门
-				R<Dept> dept = iSysClient.getDept(e.getDeptid());
-				if (dept.isSuccess() && dept.getData() != null) {
-					e.setDeptName(dept.getData().getDeptName());
+				if (e.getDeptid() != null){
+					if (ObjectUtil.isNotEmpty(deptList)){
+						e.setDeptName(deptList.getData().stream().filter(d -> d.getId().equals(e.getDeptid())).findFirst().get().getDeptName());
+					}
 				}
 				//承做人
-
-				R<User> userR = userClient.userInfoById(e.getUserid());
-				if (userR.isSuccess()) {
-					e.setUserName(userR.getData().getRealName());
+				if (e.getUserid() != null){
+					if (ObjectUtil.isNotEmpty(userList)){
+						e.setUserName(userList.stream().filter(d -> d.getId().equals(e.getUserid())).findFirst().get().getRealName());
+					}
 				}
 				//毛收入
 				e.setGrossIncome((e.getServiceCharge().add(e.getMatMoney())).subtract(e.getCostReturn()));