2024年10月24日17:16:48

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@@ -147,14 +147,20 @@ public class OssEndpoint {
 	@PostMapping("/put-file")
 	public R<BladeFile> putFile(@RequestParam("file") MultipartFile file) {
 		String status = sysClient.getParamService("upload.url");
+		String replaceUrl = sysClient.getParamService("replace.url");
 		System.err.println("upload.url:" + status);
+		System.err.println("replace.url:" + replaceUrl);
 		BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
 		String link = bladeFile.getLink();
 		System.err.println("link:" + link);
 		//String replace = link.replace("http://121.37.83.47:9000/", "https://trade.tubaosoft.com/file/");
 		String replace = "";
 		if (ObjectUtils.isNotNull(status)) {
-			replace = link.replace(status + ":9000/", status + "/file/");
+			if (ObjectUtils.isNotNull(replaceUrl)){
+				replace = link.replace(status, replaceUrl + "/file");
+			}else{
+				replace = link.replace(status + ":9000/", status + "/file/");
+			}
 		} else {
 			replace = link.replace("http://121.37.83.47:9000/", "http://121.37.83.47/file/");
 		}

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -164,6 +164,16 @@ public class Bills implements Serializable {
 	@ApiModelProperty(value = "操作")
 	private String operatorName;
 	/**
+	 * 操作部门 Id
+	 */
+	@ApiModelProperty(value = "操作部门 Id")
+	private String operatorDept;
+	/**
+	 * 操作部门
+	 */
+	@ApiModelProperty(value = "操作部门")
+	private String operatorDeptName;
+	/**
 	 * 业务来源
 	 */
 	@ApiModelProperty(value = "业务来源")
@@ -184,6 +194,16 @@ public class Bills implements Serializable {
 	@ApiModelProperty(value = "来源英文")
 	private String srcEnName;
 	/**
+	 * 来源部门 Id
+	 */
+	@ApiModelProperty(value = "来源部门 Id")
+	private String srcDeptId;
+	/**
+	 * 来源部门
+	 */
+	@ApiModelProperty(value = "来源部门")
+	private String srcDeptName;
+	/**
 	 * 客户 id
 	 */
 	@ApiModelProperty(value = "客户 id")

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

@@ -77,10 +77,10 @@ public class BasicCorpsProfitChangeController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicCorpsProfitChange")
-	public R<List<BasicCorpsProfitChange>> list(BasicCorpsProfitChange basicCorpsProfitChange) {
+	public R<IPage<BasicCorpsProfitChange>> list(BasicCorpsProfitChange basicCorpsProfitChange, Query query) {
 		//basicCorpsProfitChange.setTenantId(AuthUtil.getTenantId());
 		basicCorpsProfitChange.setIsDeleted(0);
-		List<BasicCorpsProfitChange> list = basicCorpsProfitChangeService.list(Condition.getQueryWrapper(basicCorpsProfitChange));
+		IPage<BasicCorpsProfitChange> list = basicCorpsProfitChangeService.page(Condition.getPage(query),Condition.getQueryWrapper(basicCorpsProfitChange));
 		return R.data(list);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/app/service/impl/IndexServiceImpl.java

@@ -7,6 +7,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.app.service.IndexService;
+import org.springblade.los.business.aea.entity.AeaBills;
 import org.springblade.los.business.aea.mapper.AeaBillsMapper;
 import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.amends.mapper.AmendsMapper;
@@ -40,12 +41,12 @@ public class IndexServiceImpl implements IndexService {
 
 	@Override
 	public R profit(String type, String startDate, String endDate) {
-
 		BigDecimal amountD = new BigDecimal("0.00");
 		BigDecimal amountC = new BigDecimal("0.00");
 		List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
+			.eq(AuthUtil.getUserRole().contains("业务员"), Bills::getSrcId, AuthUtil.getUserId())
 			.apply("find_in_set(bill_type,'DD,MM')")
 			.eq(ObjectUtils.isNotNull(type), Bills::getBranchId, type)
 			.ge(ObjectUtils.isNotNull(startDate), Bills::getBillDate, startDate)
@@ -55,7 +56,7 @@ public class IndexServiceImpl implements IndexService {
 		List<Amends> amendsList = amendsMapper.selectList(new LambdaQueryWrapper<Amends>()
 			.eq(Amends::getTenantId, AuthUtil.getTenantId())
 			.eq(Amends::getIsDeleted, 0)
-			.apply("find_in_set(business_type,'ASE,ASI')")
+			.apply("find_in_set(business_type,'SEA,SIA,AEA,AIA')")
 			.eq(ObjectUtils.isNotNull(type), Amends::getBranchId, type)
 			.ge(ObjectUtils.isNotNull(startDate), Amends::getBillDate, startDate)
 			.le(ObjectUtils.isNotNull(endDate), Amends::getBillDate, endDate));
@@ -65,9 +66,29 @@ public class IndexServiceImpl implements IndexService {
 				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 				.eq(FeeCenter::getIsDeleted, 0)
 				.in(FeeCenter::getId, ids));
+			if (!feeCenterList.isEmpty()) {
+				amountD = feeCenterList.stream().filter(e -> "USD".equals(e.getCurCode()) && "D".equals(e.getDc()))
+					.reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getExrate().multiply(y.getAmount())), BigDecimal::add);
+				amountC = feeCenterList.stream().filter(e -> "USD".equals(e.getCurCode()) && "C".equals(e.getDc()))
+					.reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getExrate().multiply(y.getAmount())), BigDecimal::add);
+				amountD = feeCenterList.stream().filter(e -> "CNY".equals(e.getCurCode()) && "D".equals(e.getDc()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+				amountC = feeCenterList.stream().filter(e -> "CNY".equals(e.getCurCode()) && "C".equals(e.getDc()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+			}
 		}
-
-		return null;
+		List<AeaBills> aeaBillsList = aeaBillsMapper.selectList(new LambdaQueryWrapper<AeaBills>()
+			.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
+			.eq(AeaBills::getIsDeleted, 0)
+			.apply("find_in_set(business_type,'AE,AI')")
+			.eq(ObjectUtils.isNotNull(type), AeaBills::getBranchId, type)
+			.ge(ObjectUtils.isNotNull(startDate), AeaBills::getBillDate, startDate)
+			.le(ObjectUtils.isNotNull(endDate), AeaBills::getBillDate, endDate));
+		if (!amendsList.isEmpty()) {
+			amountD = aeaBillsList.stream().map(AeaBills::getAmountDrLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+			amountC = aeaBillsList.stream().map(AeaBills::getAmountCrLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+		}
+		return R.data(amountD.subtract(amountC));
 	}
 
 	@Override

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -41,6 +41,7 @@ import org.springblade.los.business.sea.vo.BillsVO;
 import org.springblade.los.excel.BillsExcel;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -66,6 +67,8 @@ public class BillsController extends BladeController {
 
 	private final IDictBizClient dictBizClient;
 
+	private final ISysClient sysClient;
+
 	/**
 	 * 详情
 	 */
@@ -130,18 +133,38 @@ public class BillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEta, bills.getEtaList().get(0));
 			lambdaQueryWrapper.le(Bills::getEta, bills.getEtaList().get(1));
 		}
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
+		String jurisdiction = sysClient.getParamService("data.jurisdiction");
+		if ("1".equals(jurisdiction)) {
+			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
+				&& !AuthUtil.getUserRole().contains("副总") && !AuthUtil.getUserRole().contains("财务")
+				&& !AuthUtil.getUserRole().contains("经理")) {
+				if (AuthUtil.getUserRole().contains("操作经理")) {
+					lambdaQueryWrapper.eq(Bills::getOperatorDept, AuthUtil.getDeptId());
+				} else if (AuthUtil.getUserRole().contains("操作员")) {
+					lambdaQueryWrapper.eq(Bills::getOperatorId, AuthUtil.getUserId());
+				} else if (AuthUtil.getUserRole().contains("销售经理")) {
+					lambdaQueryWrapper.eq(Bills::getSrcDeptId, AuthUtil.getDeptId());
+				} else if (AuthUtil.getUserRole().contains("业务员")) {
+					lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
+				} else {
+					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
+				}
+				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			}
 		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
-				.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
-					.like(Bills::getSrcEnName, bills.getSrcCnName()));
-		}
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
-			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
-		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
+					.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
+						.like(Bills::getSrcEnName, bills.getSrcCnName()));
+			}
+			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+			}
+			if (!AuthUtil.getUserRole().contains("admin")) {
+				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			}
 		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
@@ -203,11 +226,38 @@ public class BillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEta, bills.getEtaList().get(0));
 			lambdaQueryWrapper.le(Bills::getEta, bills.getEtaList().get(1));
 		}
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
-			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
-		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+		String jurisdiction = sysClient.getParamService("data.jurisdiction");
+		if ("1".equals(jurisdiction)) {
+			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
+				&& !AuthUtil.getUserRole().contains("副总") && !AuthUtil.getUserRole().contains("财务")
+				&& !AuthUtil.getUserRole().contains("经理")) {
+				if (AuthUtil.getUserRole().contains("操作经理")) {
+					lambdaQueryWrapper.like(Bills::getOperatorDept, AuthUtil.getDeptId());
+				} else if (AuthUtil.getUserRole().contains("操作员")) {
+					lambdaQueryWrapper.like(Bills::getOperatorId, AuthUtil.getUserId());
+				} else if (AuthUtil.getUserRole().contains("销售经理")) {
+					lambdaQueryWrapper.like(Bills::getSrcDeptId, AuthUtil.getDeptId());
+				} else if (AuthUtil.getUserRole().contains("业务员")) {
+					lambdaQueryWrapper.like(Bills::getSrcId, AuthUtil.getUserId());
+				} else {
+					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
+				}
+				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			}
+		} else {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
+					.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
+						.like(Bills::getSrcEnName, bills.getSrcCnName()));
+			}
+			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+				lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+			}
+			if (!AuthUtil.getUserRole().contains("admin")) {
+				lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
+			}
 		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EDISenderServiceImpl.java

@@ -286,7 +286,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 		return map;
 	}
 
-	private static FilesCenter createEDIFilesCenter(InttraSoDto inttraSoDto, File file,String status) {
+	private static FilesCenter createEDIFilesCenter(InttraSoDto inttraSoDto, File file,String status,String replaceUrl) {
 		// Map<String, String> send = sendEDIFileToRemote(inttraSoDto, file);
 		Map<String, String> send = new HashMap<>();
 		send.put("code", "200");
@@ -298,7 +298,11 @@ public class EDISenderServiceImpl implements IEDISenderService {
 		//文件地址
 		String url = file.getAbsolutePath();
 		if (ObjectUtils.isNotNull(status)) {
-			url = url.replace("/home/minio", status);
+			if (ObjectUtils.isNotNull(replaceUrl)){
+				url = url.replace("/home/minio", replaceUrl);
+			}else{
+				url = url.replace("/home/minio", status);
+			}
 		} else {
 			url = url.replace("/home/minio", "http://121.37.83.47");
 		}
@@ -873,9 +877,11 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			// 关闭文件输出流
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(inttraSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(inttraSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
-			throw new RuntimeException("生成edi文件失败");
+//			throw new RuntimeException("生成edi文件失败");
+			throw new RuntimeException(e);
 		}
 	}
 
@@ -1470,7 +1476,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			// 关闭文件输出流
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(inttraSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(inttraSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -1710,7 +1717,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(aplSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(aplSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -1964,7 +1972,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(aplSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(aplSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -2314,7 +2323,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(oneSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(oneSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -2758,7 +2768,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(oneSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(oneSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -3119,7 +3130,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(oneSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(oneSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -3400,7 +3412,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(oneSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(oneSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -3784,7 +3797,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(pilSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(pilSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -4264,7 +4278,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(pilSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(pilSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -4647,7 +4662,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(mellSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(mellSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -5125,7 +5141,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(mellSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(mellSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -5423,7 +5440,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(hmmSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(hmmSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -5820,7 +5838,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(hmmSiDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(hmmSiDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}
@@ -6091,7 +6110,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			// 关闭文件输出流
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(smlSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(smlSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new RuntimeException("生成edi文件失败");
 		}
@@ -6380,7 +6400,8 @@ public class EDISenderServiceImpl implements IEDISenderService {
 
 			writer.close();
 			String status = sysClient.getParamService("upload.url");
-			return createEDIFilesCenter(eslSoDto, file,status);
+			String replaceUrl = sysClient.getParamService("replace.url");
+			return createEDIFilesCenter(eslSoDto, file,status,replaceUrl);
 		} catch (IOException e) {
 			throw new SecurityException("生成edi文件失败");
 		}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/BusinessOverpaymentItemController.java

@@ -79,11 +79,11 @@ public class BusinessOverpaymentItemController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入businessOverpaymentItem")
-	public R<List<BusinessOverpaymentItem>> list(BusinessOverpaymentItem businessOverpaymentItem) {
+	public R<IPage<BusinessOverpaymentItem>> list(BusinessOverpaymentItem businessOverpaymentItem, Query query) {
 		businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
-		List<BusinessOverpaymentItem> list = businessOverpaymentItemService.list(Condition.getQueryWrapper(businessOverpaymentItem));
-		if (CollectionUtils.isNotEmpty(list)){
-			list.forEach(item ->{
+		IPage<BusinessOverpaymentItem> list = businessOverpaymentItemService.page(Condition.getPage(query),Condition.getQueryWrapper(businessOverpaymentItem));
+		if (CollectionUtils.isNotEmpty(list.getRecords())){
+			list.getRecords().forEach(item ->{
 				R<User> user = userClient.userInfoById(item.getCreateUser());
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());