2023年9月1日17:41:55

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/CorpsDescDto.java

@@ -62,6 +62,12 @@ public class CorpsDescDto implements Serializable {
 	private String shortName;
 
 	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private String attn;
+
+	/**
 	 * 电话
 	 */
 	@ApiModelProperty(value = "电话")

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsCechargeRecord.java

@@ -136,4 +136,10 @@ public class CorpsCechargeRecord implements Serializable {
 	@ApiModelProperty(value = "是否提交")
 	private Integer synchronous;
 
+	/**
+	 * 租户
+	 */
+	@ApiModelProperty(value = "租户")
+	private String tenantId;
+
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/feign/IMaintenanceClient.java

@@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @date 2023年8月14日10:18:34
  */
 @FeignClient(
-	value = LauncherConstant.APPLICATION_PURCHASE_SALES_NAME
+	value = "blade-sales-part"
 )
 public interface IMaintenanceClient {
-	String API_PREFIX = "/blade-sales-part";
+	String API_PREFIX = "/maintenance";
 	String UPDATE_MAINTENANCE = API_PREFIX + "/updateMaintenance";
 	String GET_BY_MAINTENANCE = API_PREFIX + "/getByMaintenance";
 	String GET_BY_MAINTENANCE_FESS = API_PREFIX + "/getByMaintenanceFess";

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsCechargeRecordController.java

@@ -66,6 +66,7 @@ public class CorpsCechargeRecordController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入corpsCechargeRecord")
 	public R<IPage<CorpsCechargeRecord>> list(CorpsCechargeRecord corpsCechargeRecord, Query query) {
+
 		IPage<CorpsCechargeRecord> pages = corpsCechargeRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(corpsCechargeRecord));
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/controller/MaintenanceController.java

@@ -133,7 +133,7 @@ public class MaintenanceController extends BladeController {
 					.eq(ObjectUtils.isNotNull(maintenance.getStatus()), Maintenance::getStatus, maintenance.getStatus());
 			}
 			if (AuthUtil.getUserRole().contains("客户")) {
-				lambdaQueryWrapper.eq(Maintenance::getCreateUser, AuthUtil.getUserId());
+				lambdaQueryWrapper.eq(Maintenance::getCorpId, maintenance.getCorpId());
 				if (ObjectUtils.isNotNull(maintenance.getStatus())) {
 					lambdaQueryWrapper.eq(Maintenance::getStatus, maintenance.getStatus());
 				} else {
@@ -143,7 +143,7 @@ public class MaintenanceController extends BladeController {
 				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getStatus()), Maintenance::getStatus, maintenance.getStatus());
 			}
 		}
-		lambdaQueryWrapper.orderByAsc(Maintenance::getStatus);
+		lambdaQueryWrapper.orderByAsc(Maintenance::getStatus).orderByDesc(Maintenance::getStatus);
 		IPage<Maintenance> pages = maintenanceService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -333,10 +333,12 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 				if (",".equals(openIds.toString())) {
 					openIds = new StringBuilder(res.getData().getOaOpenId());
 				} else {
-					openIds.append(res.getData().getOaOpenId());
+					if (ObjectUtils.isNotNull(res.getData().getOaOpenId())) {
+						openIds.append(res.getData().getOaOpenId()).append(",");
+					}
 				}
 			}
-			wechatClient.sendMessage(openIds.toString(), "派工通知", "设备维修-撤销派工", date, maintenance.getCorpName(), maintenance.getDeviceName(),
+			wechatClient.sendMessage(openIds.substring(0, openIds.length() - 1), "派工通知", "设备维修-撤销派工", date, maintenance.getCorpName(), maintenance.getDeviceName(),
 				maintenance.getCorpTel(), maintenance.getMaintenanceWorkerTel(), maintenance.getDeviceDescribe(), maintenance.getMaintenanceAmount(), "1");
 
 			maintenance.setDispatchingWorkers("1");
@@ -627,6 +629,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		maintenanceLog.setCreateUserName(AuthUtil.getUserName());
 		maintenanceLog.setType("费用确认");
 		maintenanceLogService.save(maintenanceLog);
+		this.paymentApply(maintenance, null, "YPJ");
 		SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 		String date1 = format1.format(new Date());
 		StringBuilder openIds = new StringBuilder();