Browse Source

1.海运进出口-列表,导出接口增加所属公司检索条件
2.公司增加字段是否总部
3.海运出口获取放箱号数据接口条件修改
4.海运进出口保存接口所属公司中文名称为空修改
5.基础资料客户保存接口修改
6.批量费用模板导入接口调试及修改
7.海运进出口批量请核接口调试及修改
8.海运出口保存增加计算应结日期逻辑
9.费用模板保存逻辑修改

纪新园 8 months ago
parent
commit
610e4b5cdb
20 changed files with 199 additions and 1187 deletions
  1. 5 0
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java
  2. 16 0
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/FeesTemplateSonItems.java
  3. 0 23
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java
  4. 6 0
      blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java
  5. 1 23
      blade-service/blade-los/src/main/java/org/springblade/los/Util/MagicValues.java
  6. 1 20
      blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java
  7. 31 37
      blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/service/impl/BCorpsServiceImpl.java
  8. 1 0
      blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/LosBFeesTemplateController.java
  9. 8 0
      blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/service/impl/LosBFeesTemplateServiceImpl.java
  10. 0 3
      blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java
  11. 3 1021
      blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java
  12. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/box/controller/PutBoxController.java
  13. 6 10
      blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java
  14. 76 1
      blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java
  15. 0 2
      blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java
  16. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FeeCenterController.java
  17. 22 13
      blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java
  18. 4 17
      blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java
  19. 15 15
      blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java
  20. 2 0
      blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

+ 5 - 0
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -56,6 +56,11 @@ public class BCorps implements Serializable {
 	@ApiModelProperty(value = "分公司 Id")
 	private String branchId;
 	/**
+	 * 分公司
+	 */
+	@ApiModelProperty(value = "分公司")
+	private String branchName;
+	/**
 	 * 创建人 Id
 	 */
 	@ApiModelProperty(value = "创建人 Id")

+ 16 - 0
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/FeesTemplateSonItems.java

@@ -175,5 +175,21 @@ public class FeesTemplateSonItems implements Serializable {
 	@ApiModelProperty(value = "数量")
 	private BigDecimal quantity;
 
+	/**
+	 * 客户 Id
+	 */
+	@ApiModelProperty(value = "客户 Id")
+	private Long corpId;
+	/**
+	 * 客户中文名称
+	 */
+	@ApiModelProperty(value = "客户中文名称")
+	private String corpCnName;
+	/**
+	 * 客户英文名称
+	 */
+	@ApiModelProperty(value = "客户英文名称")
+	private String corpEnName;
+
 
 }

+ 0 - 23
blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java

@@ -817,29 +817,6 @@ public class FeeCenter implements Serializable {
 	private String auditStatus;
 
 	/**
-	 * 核算id
-	 */
-	@ApiModelProperty(value = "核算id")
-	private Long elementsId;
-
-	/**
-	 * 核算编码
-	 */
-	@ApiModelProperty(value = "核算编码")
-	private String elementsCode;
-
-	/**
-	 * 核算中文名称
-	 */
-	@ApiModelProperty(value = "核算中文名称")
-	private String elementsCnName;
-	/**
-	 * 核算英文名称
-	 */
-	@ApiModelProperty(value = "核算英文名称")
-	private String elementsEnName;
-
-	/**
 	 * 外提单号
 	 */
 	@ApiModelProperty(value = "外提单号")

+ 6 - 0
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java

@@ -244,5 +244,11 @@ public class Dept implements Serializable {
 	@TableField(exist = false)
 	private String date;
 
+	/**
+	 * 是否总部
+	 */
+	@ApiModelProperty(value = "是否总部")
+	private String isHq;
+
 
 }

+ 1 - 23
blade-service/blade-los/src/main/java/org/springblade/los/Util/MagicValues.java

@@ -7,12 +7,6 @@ package org.springblade.los.Util;
 public class MagicValues {
 
 	public static final String BUSINESS = "业务";
-	public static final String HYCKBG = "海运出口报关";
-	public static final String HYJKBG = "海运进口报关";
-	public static final String KYCKBG = "空运出口报关";
-	public static final String KYJKBG = "空运进口报关";
-	public static final String HY = "XG";
-	public static final String XG = "XG";
 	public static final String OW = "OW";
 	public static final String OW_N = "OW-N";
 	public static final String OW_F = "OW-F";
@@ -27,7 +21,6 @@ public class MagicValues {
 	public static final String COST = "费用";
 	public static final String PAID_APPLICATION = "付费申请";
 	public static final String RECONCILIATION_CENTER = "对账中心";
-	public static final String RECONCILIATION_SUMMARY = "对账汇总";
 	public static final String INVOICE_APPLICATION = "发票申请";
 	public static final String CHARGE_PAID_OFFSET = "收付相抵";
 	public static final String CHARGE_SETTLEMENT = "收费结算";
@@ -45,23 +38,13 @@ public class MagicValues {
 	public static final String SALES_REPORT = "销售报告";
 	public static final String SALES_REPORT_AMEND = "销售报告-amend";
 
-	public static final String ORDER_ALLOCATION = "配单";
-
-	public static final String THE_FIRST_ONE = "货款";
-
-	public static final String THE_FIRST_ONE_CORP = "货款-客户";
-	public static final String BALANCE_PAYMENT = "尾款";
 	public static final String MASTER_BILLS = "MASTER 提单";
 	public static final String BILLS_DETAIL = "提单详情";
 	public static final String BILLS_DETAIL_M = "提单详情(M)";
 	public static final String HYCK = "HYCK";
+
 	public static final String HYJK = "HYJK";
-	public static final String KYCK = "KYCK";
-	public static final String KYJK = "KYJK";
-	public static final String MYDL = "MYDL";
 	public static final String FYSQ = "FYSQ";
-
-	public static final String MYDL_STL = "MYDL-STL";
 	public static final String AMEND = "AMEND";
 	public static final String AMEND_SI = "AMENDSI";
 	public static final String AMEND_SE = "AMENDSE";
@@ -87,9 +70,7 @@ public class MagicValues {
 	public static final String DD = "DD";
 	public static final String PROFIT_MARGIN = "profit.margin";
 	public static final String SALESREPORT_OVERLIMIT = "salesReport.overlimit";
-	public static final String FM = "JMS";
 	public static final String DATA = "data";
-
 	public static final String[] units = {
 		"", // 0
 		"ONE", "TWO", "THREE", "FOUR", "FIVE",
@@ -105,9 +86,6 @@ public class MagicValues {
 		"SIXTY", "SEVENTY", "EIGHTY", "NINETY"
 	};
 
-
-
-	public static final String GAUGE_OUTFIT = "gaugeOutfit";
 	public static final String HUNDRED = "100";
 
 	private MagicValues() {} // 防止外部实例化该类

+ 1 - 20
blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -129,26 +129,7 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getCorpSource()), BCorps::getCorpSource, bCorps.getCorpSource())
 			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles());
-		LambdaQueryWrapper<BCorpsTypeDefine> typeDefineLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		typeDefineLambdaQueryWrapper.eq(BCorpsTypeDefine::getTenantId, AuthUtil.getTenantId())
-			.eq(BCorpsTypeDefine::getIsDeleted, 0);
-		typeDefineLambdaQueryWrapper.eq(BCorpsTypeDefine::getCorpType, "PS客户");
-		BCorpsTypeDefine typeDefine = bCorpsTypeDefineService.getOne(typeDefineLambdaQueryWrapper);
-		if ("1".equals(bCorps.getType())) {
-			if (typeDefine != null) {
-				lambdaQueryWrapper.apply("find_in_set('" + typeDefine.getId() + "',corp_type)");
-			}
-		} else {
-			if (typeDefine != null) {
-				lambdaQueryWrapper.ne(BCorps::getCorpType, typeDefine.getId());
-			}
-			lambdaQueryWrapper.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");
-		}
-		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
-			//管理员、次级管理员查看全部数据
-		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
-		}
+		lambdaQueryWrapper.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
 			lambdaQueryWrapper.orderByDesc(BCorps::getCnName);

+ 31 - 37
blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/service/impl/BCorpsServiceImpl.java

@@ -25,7 +25,6 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.Util.StringTools;
 import org.springblade.los.basic.corps.entity.*;
 import org.springblade.los.basic.corps.mapper.CorpsMapper;
@@ -55,8 +54,6 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 
 	private final ISysClient sysClient;
 
-	private final IDeptUtils deptUtils;
-
 	private final IBCorpsAttnService bCorpsAttnService;
 
 	private final IBCorpsBadrecordService bCorpsBadrecordService;
@@ -93,31 +90,33 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 	public R submit(BCorps bCorpss) throws Exception {
 		Object object = StringTools.handle(bCorpss, "BCorps");
 		BCorps bCorps = JSONObject.parseObject(JSONObject.toJSONString(object), BCorps.class);
-		String deptId = "";
+		String deptId ;
 		String deptName = "";
-		String branchId = deptUtils.getDeptPid() + "";
-		//获取部门ids对应中文名
-		if (ObjectUtils.isNotNull(deptUtils.getDeptPid() + "")) {
+		String branchId;
+		if (ObjectUtils.isNotNull(bCorps.getBranchId())){
+			deptId = bCorps.getBranchId();
+			branchId = bCorps.getBranchId();
+			deptName = bCorps.getBranchName();
+		}else{
 			deptId = AuthUtil.getDeptId();
-			R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
-			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-				deptName = String.join(",", res.getData());
-			}
+			branchId = AuthUtil.getDeptId();
+		}
+		//获取部门ids对应中文名
+		R<String> res = sysClient.getDeptName(Long.parseLong(branchId));
+		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+			deptName = res.getData();
 		}
 		List<BCorps> cname = baseMapper.selectList(new LambdaQueryWrapper<BCorps>()
 			.eq(BCorps::getCnName, bCorps.getCnName())
 			.eq(BCorps::getTenantId, AuthUtil.getTenantId())
-			.eq(BCorps::getBranchId, deptUtils.getDeptPid())
 			.eq(BCorps::getIsDeleted, 0));
 		List<BCorps> shortName = baseMapper.selectList(new LambdaQueryWrapper<BCorps>()
 			.eq(BCorps::getShortName, bCorps.getShortName())
 			.eq(BCorps::getTenantId, AuthUtil.getTenantId())
-			.eq(BCorps::getBranchId, deptUtils.getDeptPid())
 			.eq(BCorps::getIsDeleted, 0));
 		List<BCorps> uscc = baseMapper.selectList(new LambdaQueryWrapper<BCorps>()
 			.eq(BCorps::getUscc, bCorps.getUscc())
 			.eq(BCorps::getTenantId, AuthUtil.getTenantId())
-			.eq(BCorps::getBranchId, deptUtils.getDeptPid())
 			.eq(BCorps::getIsDeleted, 0));
 		//首字母为空
 		if (null == bCorps.getInitials() || bCorps.getInitials().isEmpty()) {
@@ -138,13 +137,12 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 			bCorps.setCreateTime(new Date());
 			bCorps.setCreateUser(AuthUtil.getUserId());
 			bCorps.setCreateUserName(AuthUtil.getUserName());
-			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-				bCorps.setDeptName(AuthUtil.getUserName());
-				bCorps.setDeptId(deptUtils.getDeptPid() + "");
-				bCorps.setBranchId(branchId);
-				bCorps.setCreateDept(deptId);
-				bCorps.setCreateDeptName(deptName);
-			}
+			bCorps.setDeptName(deptName);
+			bCorps.setDeptId(branchId);
+			bCorps.setBranchId(branchId);
+			bCorps.setBranchName(deptName);
+			bCorps.setCreateDept(deptId);
+			bCorps.setCreateDeptName(deptName);
 		} else {
 			List<Long> ids = cname.stream().map(BCorps::getId).distinct().collect(Collectors.toList());
 			List<Long> ids1 = uscc.stream().map(BCorps::getId).distinct().collect(Collectors.toList());
@@ -186,7 +184,7 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 			bCorps.setUpdateTime(new Date());
 			bCorps.setUpdateUserName(AuthUtil.getUserName());
 		}
-		if(ObjectUtils.isNull(bCorps.getExtendedData())){
+		if (ObjectUtils.isNull(bCorps.getExtendedData())) {
 			bCorps.setExtendedData("[]");
 		}
 		this.saveOrUpdate(bCorps);
@@ -398,16 +396,13 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R<List<BCorps>> importBCorps(List<BCorpsExcel> excelList) {
-		String deptId = "";
+		String deptId = AuthUtil.getDeptId();
 		String deptName = "";
-		String branchId = deptUtils.getDeptPid() + "";
+		String branchId = AuthUtil.getDeptId();
 		//获取部门ids对应中文名
-		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-			deptId = AuthUtil.getDeptId();
-			R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
-			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-				deptName = String.join(",", res.getData());
-			}
+		R<String> res = sysClient.getDeptName(Long.parseLong(branchId));
+		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+			deptName = res.getData();
 		}
 		List<BCorps> bCorpsList = new ArrayList<>();
 		for (BCorpsExcel item : excelList) {
@@ -452,13 +447,12 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 				bCorps.setCreateTime(new Date());
 				bCorps.setCreateUser(AuthUtil.getUserId());
 				bCorps.setCreateUserName(AuthUtil.getUserName());
-				if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-					bCorps.setDeptName(AuthUtil.getUserName());
-					bCorps.setDeptId(deptUtils.getDeptPid() + "");
-					bCorps.setCreateDept(deptId);
-					bCorps.setBranchId(branchId);
-					bCorps.setCreateDeptName(deptName);
-				}
+				bCorps.setDeptName(deptName);
+				bCorps.setDeptId(branchId);
+				bCorps.setCreateDept(deptId);
+				bCorps.setBranchId(branchId);
+				bCorps.setBranchName(deptName);
+				bCorps.setCreateDeptName(deptName);
 				this.saveOrUpdate(bCorps);
 			} else {
 				/*if (cname > 1) {

+ 1 - 0
blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/LosBFeesTemplateController.java

@@ -86,6 +86,7 @@ public class LosBFeesTemplateController extends BladeController {
 			.like(ObjectUtils.isNotNull(losBFeesTemplate.getEnName()), LosBFeesTemplate::getEnName, losBFeesTemplate.getEnName())
 			.like(ObjectUtils.isNotNull(losBFeesTemplate.getStatus()), LosBFeesTemplate::getStatus, losBFeesTemplate.getStatus())
 			.eq(ObjectUtils.isNotNull(losBFeesTemplate.getBusinessTypeId()), LosBFeesTemplate::getBusinessTypeId, losBFeesTemplate.getBusinessTypeId())
+			.eq(ObjectUtils.isNotNull(losBFeesTemplate.getDc()), LosBFeesTemplate::getDc, losBFeesTemplate.getDc())
 			.eq(ObjectUtils.isNotNull(losBFeesTemplate.getBusinessTypeCnName()), LosBFeesTemplate::getBusinessTypeCnName, losBFeesTemplate.getBusinessTypeCnName())
 			.eq(ObjectUtils.isNotNull(losBFeesTemplate.getBusinessTypeCode()), LosBFeesTemplate::getBusinessTypeCode, losBFeesTemplate.getBusinessTypeCode())
 			.eq(ObjectUtils.isNotNull(losBFeesTemplate.getAddressId()), LosBFeesTemplate::getAddressId, losBFeesTemplate.getAddressId())

+ 8 - 0
blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/service/impl/LosBFeesTemplateServiceImpl.java

@@ -208,6 +208,11 @@ public class LosBFeesTemplateServiceImpl extends ServiceImpl<LosBFeesTemplateMap
 						if(ObjectUtils.isNull(sonItems.getDc())){
 							sonItems.setDc(item.getDc());
 						}
+						sonItems.setUnitNo(item.getUnitNo());
+						sonItems.setUnitId(item.getUnitId());
+						sonItems.setCorpId(item.getCorpId());
+						sonItems.setCorpCnName(item.getCorpCnName());
+						sonItems.setCorpEnName(item.getCorpEnName());
 						sonItems.setPid(losBFeesTemplate.getId());
 						sonItems.setPpid(item.getId());
 						sonItems.setFeeId(item.getFeeId());
@@ -237,6 +242,9 @@ public class LosBFeesTemplateServiceImpl extends ServiceImpl<LosBFeesTemplateMap
 					sonItems.setCreateUser(AuthUtil.getUserId());
 					sonItems.setCreateUserName(AuthUtil.getUserName());
 					sonItems.setType(item.getCorpType());
+					sonItems.setCorpId(item.getCorpId());
+					sonItems.setCorpCnName(item.getCorpCnName());
+					sonItems.setCorpEnName(item.getCorpEnName());
 					sonItems.setFeeId(item.getFeeId());
 					sonItems.setFeeCode(item.getFeeCode());
 					sonItems.setFeeCnName(item.getFeeCnName());

+ 0 - 3
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java

@@ -56,8 +56,6 @@ public class ReportsController extends BladeController {
 
 	private final IReportsBoxService reportsBoxService;
 
-	private final IDeptUtils deptUtils;
-
 	/**
 	 * 详情
 	 */
@@ -79,7 +77,6 @@ public class ReportsController extends BladeController {
 		LambdaQueryWrapper<Reports> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Reports::getTenantId, AuthUtil.getTenantId())
 			.eq(Reports::getIsDeleted, 0)
-			.eq(Reports::getBranchId, deptUtils.getDeptPid())
 			.like(ObjectUtils.isNotNull(reports.getCnName()), Reports::getCnName, reports.getCnName())
 			.apply(ObjectUtils.isNotNull(reports.getCode()), "find_in_set(code,'" + reports.getCode() + "')")
 			.apply(ObjectUtils.isNotNull(reports.getGroupCode()), "find_in_set(group_code,'" + reports.getGroupCode() + "')")

+ 3 - 1021
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -195,9 +195,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		}
 		if (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type)) {
 			return this.getReportDataHY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
-		} else if (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type)) {
-			return this.getReportDataKY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
-		} else if (MagicValues.AMEND.equals(type)) {
+		}  else if (MagicValues.AMEND.equals(type)) {
 			return this.getReportDataAmend(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
 		} else if (MagicValues.BGSE.equals(type) || MagicValues.BGSI.equals(type) || MagicValues.BGAE.equals(type) || MagicValues.BGAI.equals(type)) {
 			return this.getReportDataBG(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
@@ -2869,9 +2867,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.eq(FeeCenter::getIsDeleted, 0));
 					List<Long> amendIds = feeCenterList.stream().filter(f -> AmendType.isAmendType(f.getBusinessType())).map(FeeCenter::getPid).distinct().collect(Collectors.toList());
 					allFeeCenter.addAll(feeCenterList);
-					List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
-						.select(Amends::getId, Amends::getStatus).in(Amends::getId, amendIds));
 					if (!CollectionUtils.isEmpty(amendIds)) {
+						List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
+							.select(Amends::getId, Amends::getStatus).in(Amends::getId, amendIds));
 						feeCenterList = feeCenterList.stream().filter(fc -> {
 							// 是 amend 类型并没审核通过的不计入
 							Amends amends = amendsList.stream().filter(a -> a.getId().equals(fc.getPid())).findFirst().orElse(null);
@@ -3668,1022 +3666,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		return R.data(map);
 	}
 
-	public R<Map<String, Object>> getReportDataKY(String billId, String reportCode, String groupCode, String corpIds,
-												  String itemIds, String type, String curCode) {
-		Map<String, Object> map = new HashMap<>();
-		if (ObjectUtils.isNull(billId)) {
-			throw new RuntimeException("缺少比要参数");
-		}
-		R<Dept> res = sysClient.getDept(deptUtils.getDeptPid());
-		Dept dept;
-		if (res.isSuccess() && res.getData() != null) {
-			dept = res.getData();
-			String status = sysClient.getParamServiceNew("is.update.default");
-			if ("1".equals(status)) {
-				R<User> resUser = userClient.userInfoById(AuthUtil.getUserId());
-				if (resUser.isSuccess() && resUser.getData() != null) {
-					dept.setEmail(resUser.getData().getEmail());
-					dept.setTel(resUser.getData().getPhone());
-					dept.setContacts(resUser.getData().getRealName());
-				}
-			}
-		} else {
-			throw new RuntimeException("获取报表表头数据失败");
-		}
-		BCurrency bCurrency = ibCurrencyService.getOne(new LambdaQueryWrapper<BCurrency>()
-			.eq(BCurrency::getStatus, 0)
-			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
-			.eq(BCurrency::getIsDeleted, 0)
-			.eq(BCurrency::getCode, MagicValues.USD));
-		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			List<AeaBills> list = new ArrayList<>();
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				if (bCurrency != null) {
-					bills.setRate(bCurrency.getExrate());
-				} else {
-					bills.setRate(new BigDecimal(MagicValues.ZERO));
-				}
-				if (ObjectUtils.isNotNull(bills.getAmountProfitLoc()) && ObjectUtils.isNotNull(bills.getAmountDrLoc())) {
-					if (bills.getAmountProfitLoc().compareTo(new BigDecimal(MagicValues.ZERO)) == 0 ||
-						bills.getAmountDrLoc().compareTo(new BigDecimal(MagicValues.ZERO)) == 0) {
-						bills.setGrossMargin(new BigDecimal(MagicValues.ZERO));
-					} else {
-						bills.setGrossMargin(bills.getAmountProfitLoc().divide(bills.getAmountDrLoc(), 4, RoundingMode.HALF_UP));
-					}
-				} else {
-					bills.setGrossMargin(new BigDecimal(MagicValues.ZERO));
-				}
-				if (MagicValues.MM.equals(bills.getBillType()) || MagicValues.DD.equals(bills.getBillType())) {
-					List<AeaBills> billsList = aeaBillsService.list(new LambdaQueryWrapper<AeaBills>()
-						.eq(AeaBills::getMasterId, bills.getId())
-						.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
-						.eq(AeaBills::getIsDeleted, 0));
-					if (!billsList.isEmpty()) {
-						List<Long> ids = billsList.stream().map(AeaBills::getId).filter(Objects::nonNull).collect(Collectors.toList());
-						if (!ids.isEmpty()) {
-							List<FeeCenter> feeCenterListMh = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
-								.in(FeeCenter::getPid, ids)
-								.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-								.eq(FeeCenter::getIsDeleted, 0));
-							for (AeaBills item : billsList) {
-								for (FeeCenter items : feeCenterListMh) {
-									if (ObjectUtils.isNotNull(items.getShortName())) {
-										items.setCorpCnName(items.getShortName());
-									} else {
-										items.setCorpCnName("无");
-									}
-									if (ObjectUtils.isNotNull(items.getBillShortName())) {
-										items.setBillCorpCnName(items.getBillShortName());
-									} else {
-										items.setBillCorpCnName("无");
-									}
-								}
-								List<FeeCenter> feeCenterList = feeCenterListMh.stream()
-									.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-										Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getDc()))), ArrayList::new));
-								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
-								for (FeeCenter fee : feeCenterList) {
-									FeeCenterReports feeCenterReports = new FeeCenterReports();
-									feeCenterReports.setRemarks(fee.getRemarks());
-									feeCenterReports.setPid(item.getId());
-									feeCenterReports.setFeeCnName(fee.getFeeCnName());
-									feeCenterReports.setDc(fee.getDc());
-									List<FeeCenter> feeCenterListD = feeCenterListMh.stream()
-										.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(item.getId()) &&
-											e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-											e.getCorpId().equals(fee.getCorpId()))
-										.collect(Collectors.toList());
-									if (!feeCenterListD.isEmpty()) {
-										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-										feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-										feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									}
-									List<FeeCenter> feeCenterListUsdD = feeCenterListMh.stream()
-										.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(item.getId()) &&
-											e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-											e.getCorpId().equals(fee.getCorpId()))
-										.collect(Collectors.toList());
-									if (!feeCenterListUsdD.isEmpty()) {
-										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-										feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-										feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									}
-									List<FeeCenter> feeCenterListC = feeCenterListMh.stream()
-										.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(item.getId()) &&
-											e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-											e.getCorpId().equals(fee.getCorpId()))
-										.collect(Collectors.toList());
-									if (!feeCenterListC.isEmpty()) {
-										feeCenterReports.setCorpCnName(fee.getCorpCnName());
-										feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-										feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									}
-									List<FeeCenter> feeCenterListUsdC = feeCenterListMh.stream()
-										.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(item.getId()) &&
-											e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-											e.getCorpId().equals(fee.getCorpId()))
-										.collect(Collectors.toList());
-									if (!feeCenterListUsdC.isEmpty()) {
-										feeCenterReports.setCorpCnName(fee.getCorpCnName());
-										feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-										feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
-											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									}
-									feeCenterReportList.add(feeCenterReports);
-								}
-								item.setFeeCenterList(feeCenterReportList);
-								list.add(item);
-							}
-						}
-					}
-					List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
-						.eq(FeeCenter::getPid, bills.getId())
-						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-						.eq(FeeCenter::getIsDeleted, 0));
-					if (!feeCenterList.isEmpty()) {
-						for (FeeCenter item : feeCenterList) {
-							if (ObjectUtils.isNotNull(item.getShortName())) {
-								item.setCorpCnName(item.getShortName());
-							} else {
-								item.setCorpCnName("无");
-							}
-							if (ObjectUtils.isNotNull(item.getBillShortName())) {
-								item.setBillCorpCnName(item.getBillShortName());
-							} else {
-								item.setBillCorpCnName("无");
-							}
-						}
-						List<FeeCenter> feeCenters = feeCenterList.stream()
-							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getDc()))), ArrayList::new));
-						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
-						for (FeeCenter fee : feeCenters) {
-							FeeCenterReports feeCenterReports = new FeeCenterReports();
-							feeCenterReports.setRemarks(fee.getRemarks());
-							feeCenterReports.setPid(bills.getId());
-							feeCenterReports.setFeeCnName(fee.getFeeCnName());
-							feeCenterReports.setDc(fee.getDc());
-							List<FeeCenter> feeCenterListD = feeCenterList.stream()
-								.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListD.isEmpty()) {
-								feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							List<FeeCenter> feeCenterListUsdD = feeCenterList.stream()
-								.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListUsdD.isEmpty()) {
-								feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							List<FeeCenter> feeCenterListC = feeCenterList.stream()
-								.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListC.isEmpty()) {
-								feeCenterReports.setCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							List<FeeCenter> feeCenterListUsdC = feeCenterList.stream()
-								.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListUsdC.isEmpty()) {
-								feeCenterReports.setCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							feeCenterReportList.add(feeCenterReports);
-						}
-						bills.setFeeCenterList(feeCenterReportList);
-					}
-					list.add(0, bills);
-				} else if (MagicValues.MH.equals(bills.getBillType())) {
-					AeaBills details = aeaBillsService.getOne(new LambdaQueryWrapper<AeaBills>()
-						.eq(AeaBills::getId, bills.getMasterId())
-						.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
-						.eq(AeaBills::getIsDeleted, 0));
-					if (details != null) {
-						List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
-							.eq(FeeCenter::getPid, bills.getId())
-							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-							.eq(FeeCenter::getIsDeleted, 0));
-						if (!feeCenterList.isEmpty()) {
-							for (FeeCenter item : feeCenterList) {
-								if (ObjectUtils.isNotNull(item.getShortName())) {
-									item.setCorpCnName(item.getShortName());
-								} else {
-									item.setCorpCnName("无");
-								}
-								if (ObjectUtils.isNotNull(item.getBillShortName())) {
-									item.setBillCorpCnName(item.getBillShortName());
-								} else {
-									item.setBillCorpCnName("无");
-								}
-							}
-							List<FeeCenter> feeCenters = feeCenterList.stream()
-								.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-									Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getDc()))), ArrayList::new));
-							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
-							for (FeeCenter fee : feeCenters) {
-								FeeCenterReports feeCenterReports = new FeeCenterReports();
-								feeCenterReports.setRemarks(fee.getRemarks());
-								feeCenterReports.setPid(bills.getId());
-								feeCenterReports.setFeeCnName(fee.getFeeCnName());
-								feeCenterReports.setDc(fee.getDc());
-								List<FeeCenter> feeCenterListD = feeCenterList.stream()
-									.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-										e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-										e.getCorpId().equals(fee.getCorpId()))
-									.collect(Collectors.toList());
-								if (!feeCenterListD.isEmpty()) {
-									feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-									feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								}
-								List<FeeCenter> feeCenterListUsdD = feeCenterList.stream()
-									.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-										e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-										e.getCorpId().equals(fee.getCorpId()))
-									.collect(Collectors.toList());
-								if (!feeCenterListUsdD.isEmpty()) {
-									feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-									feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								}
-								List<FeeCenter> feeCenterListC = feeCenterList.stream()
-									.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-										e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-										e.getCorpId().equals(fee.getCorpId()))
-									.collect(Collectors.toList());
-								if (!feeCenterListC.isEmpty()) {
-									feeCenterReports.setCorpCnName(fee.getCorpCnName());
-									feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								}
-								List<FeeCenter> feeCenterListUsdC = feeCenterList.stream()
-									.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(bills.getId()) &&
-										e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-										e.getCorpId().equals(fee.getCorpId()))
-									.collect(Collectors.toList());
-								if (!feeCenterListUsdC.isEmpty()) {
-									feeCenterReports.setCorpCnName(fee.getCorpCnName());
-									feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-									feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
-										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								}
-								feeCenterReportList.add(feeCenterReports);
-							}
-							bills.setFeeCenterList(feeCenterReportList);
-						}
-						list.add(bills);
-						List<FeeCenter> feeCenterListMh = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
-							.eq(FeeCenter::getPid, details.getId())
-							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-							.eq(FeeCenter::getIsDeleted, 0));
-						for (FeeCenter item : feeCenterListMh) {
-							if (ObjectUtils.isNotNull(item.getShortName())) {
-								item.setCorpCnName(item.getShortName());
-							} else {
-								item.setCorpCnName("无");
-							}
-							if (ObjectUtils.isNotNull(item.getBillShortName())) {
-								item.setBillCorpCnName(item.getBillShortName());
-							} else {
-								item.setBillCorpCnName("无");
-							}
-						}
-						List<FeeCenter> feeCenterList1 = feeCenterListMh.stream()
-							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getDc()))), ArrayList::new));
-						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
-						for (FeeCenter fee : feeCenterList1) {
-							FeeCenterReports feeCenterReports = new FeeCenterReports();
-							feeCenterReports.setRemarks(fee.getRemarks());
-							feeCenterReports.setPid(details.getId());
-							feeCenterReports.setFeeCnName(fee.getFeeCnName());
-							feeCenterReports.setDc(fee.getDc());
-							List<FeeCenter> feeCenterListD = feeCenterListMh.stream()
-								.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(details.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListD.isEmpty()) {
-								feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							List<FeeCenter> feeCenterListUsdD = feeCenterListMh.stream()
-								.filter(e -> MagicValues.D.equals(e.getDc()) && e.getPid().equals(details.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListUsdD.isEmpty()) {
-								feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							List<FeeCenter> feeCenterListC = feeCenterListMh.stream()
-								.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(details.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.CNY.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListC.isEmpty()) {
-								feeCenterReports.setCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							List<FeeCenter> feeCenterListUsdC = feeCenterListMh.stream()
-								.filter(e -> MagicValues.C.equals(e.getDc()) && e.getPid().equals(details.getId()) &&
-									e.getFeeId().equals(fee.getFeeId()) && MagicValues.USD.equals(e.getCurCode()) && fee.getCurCode().equals(e.getCurCode()) &&
-									e.getCorpId().equals(fee.getCorpId()))
-								.collect(Collectors.toList());
-							if (!feeCenterListUsdC.isEmpty()) {
-								feeCenterReports.setCorpCnName(fee.getCorpCnName());
-								feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-								feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
-									.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-							}
-							feeCenterReportList.add(feeCenterReports);
-						}
-						details.setFeeCenterList(feeCenterReportList);
-						list.add(0, details);
-					}
-				}
-				if (!list.isEmpty()) {
-					for (AeaBills item : list) {
-						List<FeeCenterReports> feeCenterReports = new ArrayList<>();
-						List<FeeCenterReports> feeCenterReportsD = item.getFeeCenterList().stream()
-							.filter(e -> MagicValues.D.equals(e.getDc())).collect(Collectors.toList()) == null ? new ArrayList<>() :
-							item.getFeeCenterList().stream().filter(e -> MagicValues.D.equals(e.getDc())).collect(Collectors.toList());
-						List<FeeCenterReports> feeCenterReportsC = item.getFeeCenterList().stream()
-							.filter(e -> MagicValues.C.equals(e.getDc())).collect(Collectors.toList()) == null ? new ArrayList<>() :
-							item.getFeeCenterList().stream().filter(e -> MagicValues.C.equals(e.getDc())).collect(Collectors.toList());
-						List<FeeCenterReports> feeCentersD = feeCenterReportsD.stream()
-							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(e -> e.getFeeCnName() + e.getBillCorpCnName()))), ArrayList::new));
-						int countC = 0;
-						for (int i = 0; i < feeCentersD.size(); i++) {
-							FeeCenterReports feeCenterReports1 = new FeeCenterReports();
-							feeCenterReports1.setFeeCnName(feeCentersD.get(i).getFeeCnName());
-							feeCenterReports1.setHblno(feeCentersD.get(i).getHblno());
-							feeCenterReports1.setPid(feeCentersD.get(i).getPid());
-							int finalI = i;
-							FeeCenterReports feeCenterC = feeCenterReportsC.stream()
-								.filter(e -> e.getFeeCnName().equals(feeCentersD.get(finalI).getFeeCnName()) && !"1".equals(e.getMark())).findFirst().orElse(null);
-							feeCenterReports1.setBillCorpCnName(feeCentersD.get(i).getBillCorpCnName());
-							feeCenterReports1.setAmountD(feeCentersD.get(i).getAmountD());
-							feeCenterReports1.setAmountLocD(feeCentersD.get(i).getAmountLocD());
-							feeCenterReports1.setAmountUsdD(feeCentersD.get(i).getAmountUsdD());
-							if (feeCenterC != null) {
-								feeCenterC.setMark("1");
-								feeCenterReports1.setCorpCnName(feeCenterC.getCorpCnName());
-								feeCenterReports1.setAmountC(feeCenterC.getAmountC());
-								feeCenterReports1.setAmountLocC(feeCenterC.getAmountLocC());
-								feeCenterReports1.setAmountUsdC(feeCenterC.getAmountUsdC());
-								countC++;
-							}
-							feeCenterReports.add(feeCenterReports1);
-						}
-						if (countC < feeCenterReportsC.size()) {
-							List<FeeCenterReports> feeCe = feeCenterReportsC.stream()
-								.filter(e -> !"1".equals(e.getMark())).collect(Collectors.toList());
-							for (FeeCenterReports i : feeCe) {
-								FeeCenterReports feeCenterReports1 = new FeeCenterReports();
-								feeCenterReports1.setFeeCnName(i.getFeeCnName());
-								feeCenterReports1.setHblno(i.getHblno());
-								feeCenterReports1.setPid(i.getPid());
-								feeCenterReports1.setCorpCnName(i.getCorpCnName());
-								feeCenterReports1.setAmountC(i.getAmountC());
-								feeCenterReports1.setAmountLocC(i.getAmountLocC());
-								feeCenterReports1.setAmountUsdC(i.getAmountUsdC());
-								feeCenterReports.add(feeCenterReports1);
-							}
-						}
-						item.setDept(dept);
-						item.setFeeCenterList(feeCenterReports);
-					}
-				}
-				map.put(MagicValues.DATA, list);
-			}
-		} else if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.MASTER_BILLS.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				BigDecimal boxWeightSum = BigDecimal.ZERO;
-				List<ContainersReports> containersReportsList = new ArrayList<>();
-				List<Containers> containersList = containersService.list(new LambdaQueryWrapper<Containers>()
-					.eq(Containers::getTenantId, AuthUtil.getTenantId())
-					.eq(Containers::getIsDeleted, 0)
-					.eq(Containers::getPid, bills.getId()));
-				List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
-					.eq(PreContainers::getTenantId, AuthUtil.getTenantId())
-					.eq(PreContainers::getIsDeleted, 0)
-					.eq(PreContainers::getPid, bills.getId()));
-				if (!containersList.isEmpty()) {
-					boxWeightSum = boxWeightSum.add(containersList.get(0).getGrossWeight());
-					if (!preContainersList.isEmpty()) {
-						List<PreContainers> preContainers = preContainersList.stream().filter(e -> e.getCntrTypeCode().equals(containersList.get(0).getCntrTypeCode()))
-							.collect(Collectors.toList());
-						if (!preContainers.isEmpty()) {
-							boxWeightSum = boxWeightSum.add(containersList.get(0).getGrossWeight());
-						}
-					}
-				}
-				bills.setBoxWeightSum(boxWeightSum);
-				for (Containers item : containersList) {
-					ContainersReports containersReports = new ContainersReports();
-					BeanUtil.copyProperties(item, containersReports);
-					if (!preContainersList.isEmpty()) {
-						List<PreContainers> preContainers = preContainersList.stream().filter(e -> e.getCntrTypeCode().equals(item.getCntrTypeCode()))
-							.collect(Collectors.toList());
-						if (!preContainers.isEmpty()) {
-							containersReports.setBoxWeight(preContainers.get(0).getGrossWeight());
-						}
-					}
-					containersReportsList.add(containersReports);
-				}
-				bills.setContainersReportsList(containersReportsList);
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.DISPATCH_NOTICE.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.INCOMING_NOTIFICATION.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		} else if (MagicValues.COST.equals(reportCode) && MagicValues.RECEIVABLE.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				List<FeeCenter> feeCenterList;
-				List<Long> ids = new ArrayList<>();
-				if (MagicValues.MM.equals(bills.getBillType())) {
-					List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
-						.eq(Bills::getTenantId, AuthUtil.getTenantId())
-						.eq(Bills::getIsDeleted, 0)
-						.eq(Bills::getMasterId, bills.getId())
-						.eq(Bills::getMasterBillNo, bills.getBillNo()));
-					if (!billsList.isEmpty()) {
-						ids = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-					}
-				}
-				ids.add(0, bills.getId());
-				LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getDc, MagicValues.D)
-					.eq(FeeCenter::getIsDeleted, 0);
-				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
-				if (ObjectUtils.isNotNull(corpIds)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);
-				} else {
-					if (ObjectUtils.isNotNull(itemIds)) {
-						lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
-					}
-				}
-				if (ObjectUtils.isNotNull(curCode)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCurCode, curCode);
-				}
-				feeCenterList = feeCenterService.list(lambdaQueryWrapper);
-				BigDecimal amountDr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfit;
-				BigDecimal amountDrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitUsd;
-				BigDecimal amountDrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitLoc;
-				List<FeeCenterReports> feeCenterReportsList = new ArrayList<>();
-				for (FeeCenter item : feeCenterList) {
-					if (ObjectUtils.isNotNull(item.getShortName())) {
-						item.setCorpCnName(item.getShortName());
-					} else {
-						item.setCorpCnName("无");
-					}
-					if (ObjectUtils.isNotNull(item.getBillShortName())) {
-						item.setBillCorpCnName(item.getBillShortName());
-					} else {
-						item.setBillCorpCnName("无");
-					}
-					if (MagicValues.D.equals(item.getDc())) {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountDrUsd = amountDrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountDr = amountDr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountDrUsd = amountDrUsd.add(usd);
-						}
-					} else {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountCrUsd = amountCrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountCr = amountCr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountCrUsd = amountCrUsd.add(usd);
-						}
-					}
-					FeeCenterReports feeCenterReports = new FeeCenterReports();
-					feeCenterReports.setRemarks(item.getRemarks());
-					feeCenterReports.setPid(item.getPid());
-					feeCenterReports.setCorpCnName(item.getCorpCnName());
-					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
-					feeCenterReports.setFeeCnName(item.getFeeCnName());
-					if (MagicValues.CNY.equals(item.getCurCode())) {
-						feeCenterReports.setAmountD(item.getAmount());
-					} else {
-						feeCenterReports.setAmountUsdD(item.getAmount());
-					}
-					feeCenterReports.setAmountLocD(item.getAmountLoc());
-					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
-					feeCenterReportsList.add(feeCenterReports);
-				}
-				if (!feeCenterList.isEmpty()) {
-					bills.setTo(feeCenterList.get(0).getCorpCnName());
-					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
-				}
-				bills.setFeeCenterList(feeCenterReportsList);
-				amountProfit = amountDr.subtract(amountCr);
-				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountDrUsd, MagicValues.D, "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountCrUsd, MagicValues.C, "1")).add(amountCr);
-				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
-				bills.setAmountDr(amountDr);
-				bills.setAmountCr(amountCr);
-				bills.setAmountProfit(amountProfit);
-				bills.setAmountDrUsd(amountDrUsd);
-				bills.setAmountCrUsd(amountCrUsd);
-				bills.setAmountProfitUsd(amountProfitUsd);
-				bills.setAmountDrLoc(amountDrLoc);
-				bills.setAmountCrLoc(amountCrLoc);
-				bills.setAmountProfitLoc(amountProfitLoc);
-				List<BCorpsBank> bCorpsBanks = bankService.list(new LambdaQueryWrapper<BCorpsBank>()
-					.eq(BCorpsBank::getTenantId, AuthUtil.getTenantId())
-					.eq(BCorpsBank::getIsDeleted, 0)
-					.eq(BCorpsBank::getPid, bills.getCorpId()));
-				if (!bCorpsBanks.isEmpty()) {
-					bills.setAccountBank(bCorpsBanks.get(0).getAccountBank());
-					bills.setAccountNo(bCorpsBanks.get(0).getAccountNo());
-					bills.setAddress(bCorpsBanks.get(0).getAddress());
-					bills.setSwiftCode(bCorpsBanks.get(0).getSwiftCode());
-				}
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		} else if (MagicValues.COST.equals(reportCode) && MagicValues.RECEIVABLE_BILL.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				List<FeeCenter> feeCenterList;
-				List<Long> ids = new ArrayList<>();
-				if (MagicValues.MM.equals(bills.getBillType())) {
-					List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
-						.eq(Bills::getTenantId, AuthUtil.getTenantId())
-						.eq(Bills::getIsDeleted, 0)
-						.eq(Bills::getMasterId, bills.getId())
-						.eq(Bills::getMasterBillNo, bills.getBillNo()));
-					if (!billsList.isEmpty()) {
-						ids = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-					}
-				}
-				ids.add(0, bills.getId());
-				LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getDc, MagicValues.D)
-					.eq(FeeCenter::getAccStatus, 1)
-					.eq(FeeCenter::getIsDeleted, 0);
-				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
-				if (ObjectUtils.isNotNull(corpIds)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);
-				} else {
-					if (ObjectUtils.isNotNull(itemIds)) {
-						lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
-					}
-				}
-				if (ObjectUtils.isNotNull(curCode)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCurCode, curCode);
-				}
-				feeCenterList = feeCenterService.list(lambdaQueryWrapper);
-				BigDecimal amountDr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfit;
-				BigDecimal amountDrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitUsd;
-				BigDecimal amountDrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitLoc;
-				List<FeeCenterReports> feeCenterReportsList = new ArrayList<>();
-				for (FeeCenter item : feeCenterList) {
-					if (ObjectUtils.isNotNull(item.getShortName())) {
-						item.setCorpCnName(item.getShortName());
-					} else {
-						item.setCorpCnName("无");
-					}
-					if (ObjectUtils.isNotNull(item.getBillShortName())) {
-						item.setBillCorpCnName(item.getBillShortName());
-					} else {
-						item.setBillCorpCnName("无");
-					}
-					if (MagicValues.D.equals(item.getDc())) {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountDrUsd = amountDrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountDr = amountDr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountDrUsd = amountDrUsd.add(usd);
-						}
-					} else {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountCrUsd = amountCrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountCr = amountCr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountCrUsd = amountCrUsd.add(usd);
-						}
-					}
-					FeeCenterReports feeCenterReports = new FeeCenterReports();
-					feeCenterReports.setRemarks(item.getRemarks());
-					feeCenterReports.setPid(item.getPid());
-					feeCenterReports.setCorpCnName(item.getCorpCnName());
-					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
-					feeCenterReports.setFeeCnName(item.getFeeCnName());
-					if (MagicValues.CNY.equals(item.getCurCode())) {
-						feeCenterReports.setAmountD(item.getAmount());
-					} else {
-						feeCenterReports.setAmountUsdD(item.getAmount());
-					}
-					feeCenterReports.setAmountLocD(item.getAmountLoc());
-					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
-					feeCenterReportsList.add(feeCenterReports);
-				}
-				if (!feeCenterList.isEmpty()) {
-					bills.setTo(feeCenterList.get(0).getCorpCnName());
-					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
-				}
-				bills.setFeeCenterList(feeCenterReportsList);
-				amountProfit = amountDr.subtract(amountCr);
-				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountDrUsd, MagicValues.D, "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountCrUsd, MagicValues.C, "1")).add(amountCr);
-				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
-				bills.setAmountDr(amountDr);
-				bills.setAmountCr(amountCr);
-				bills.setAmountProfit(amountProfit);
-				bills.setAmountDrUsd(amountDrUsd);
-				bills.setAmountCrUsd(amountCrUsd);
-				bills.setAmountProfitUsd(amountProfitUsd);
-				bills.setAmountDrLoc(amountDrLoc);
-				bills.setAmountCrLoc(amountCrLoc);
-				bills.setAmountProfitLoc(amountProfitLoc);
-				List<BCorpsBank> bCorpsBanks = bankService.list(new LambdaQueryWrapper<BCorpsBank>()
-					.eq(BCorpsBank::getTenantId, AuthUtil.getTenantId())
-					.eq(BCorpsBank::getIsDeleted, 0)
-					.eq(BCorpsBank::getPid, bills.getCorpId()));
-				if (!bCorpsBanks.isEmpty()) {
-					bills.setAccountBank(bCorpsBanks.get(0).getAccountBank());
-					bills.setAccountNo(bCorpsBanks.get(0).getAccountNo());
-					bills.setAddress(bCorpsBanks.get(0).getAddress());
-					bills.setSwiftCode(bCorpsBanks.get(0).getSwiftCode());
-				}
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		} else if (MagicValues.COST.equals(reportCode) && MagicValues.MEET.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				List<FeeCenter> feeCenterList;
-				List<Long> ids = new ArrayList<>();
-				if (MagicValues.MM.equals(bills.getBillType())) {
-					List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
-						.eq(Bills::getTenantId, AuthUtil.getTenantId())
-						.eq(Bills::getIsDeleted, 0)
-						.eq(Bills::getMasterId, bills.getId())
-						.eq(Bills::getMasterBillNo, bills.getBillNo()));
-					if (!billsList.isEmpty()) {
-						ids = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-					}
-				}
-				ids.add(0, bills.getId());
-				LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getDc, MagicValues.C)
-					.eq(FeeCenter::getIsDeleted, 0);
-				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
-				if (ObjectUtils.isNotNull(corpIds)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);
-				} else {
-					if (ObjectUtils.isNotNull(itemIds)) {
-						lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
-					}
-				}
-				if (ObjectUtils.isNotNull(curCode)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCurCode, curCode);
-				}
-				feeCenterList = feeCenterService.list(lambdaQueryWrapper);
-				BigDecimal amountDr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfit;
-				BigDecimal amountDrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitUsd;
-				BigDecimal amountDrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitLoc;
-				List<FeeCenterReports> feeCenterReportsList = new ArrayList<>();
-				for (FeeCenter item : feeCenterList) {
-					if (ObjectUtils.isNotNull(item.getShortName())) {
-						item.setCorpCnName(item.getShortName());
-					} else {
-						item.setCorpCnName("无");
-					}
-					if (ObjectUtils.isNotNull(item.getBillShortName())) {
-						item.setBillCorpCnName(item.getBillShortName());
-					} else {
-						item.setBillCorpCnName("无");
-					}
-					if (MagicValues.D.equals(item.getDc())) {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountDrUsd = amountDrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountDr = amountDr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountDrUsd = amountDrUsd.add(usd);
-						}
-					} else {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountCrUsd = amountCrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountCr = amountCr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountCrUsd = amountCrUsd.add(usd);
-						}
-					}
-					FeeCenterReports feeCenterReports = new FeeCenterReports();
-					feeCenterReports.setRemarks(item.getRemarks());
-					feeCenterReports.setPid(item.getPid());
-					feeCenterReports.setCorpCnName(item.getCorpCnName());
-					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
-					feeCenterReports.setFeeCnName(item.getFeeCnName());
-					if (MagicValues.CNY.equals(item.getCurCode())) {
-						feeCenterReports.setAmountC(item.getAmount());
-					} else {
-						feeCenterReports.setAmountUsdC(item.getAmount());
-					}
-					feeCenterReports.setAmountLocC(item.getAmountLoc());
-					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
-					feeCenterReportsList.add(feeCenterReports);
-				}
-				if (!feeCenterList.isEmpty()) {
-					bills.setTo(feeCenterList.get(0).getCorpCnName());
-					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
-				}
-				bills.setFeeCenterList(feeCenterReportsList);
-				amountProfit = amountDr.subtract(amountCr);
-				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountDrUsd, MagicValues.D, "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountCrUsd, MagicValues.C, "1")).add(amountCr);
-				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
-				bills.setAmountDr(amountDr);
-				bills.setAmountCr(amountCr);
-				bills.setAmountProfit(amountProfit);
-				bills.setAmountDrUsd(amountDrUsd);
-				bills.setAmountCrUsd(amountCrUsd);
-				bills.setAmountProfitUsd(amountProfitUsd);
-				bills.setAmountDrLoc(amountDrLoc);
-				bills.setAmountCrLoc(amountCrLoc);
-				bills.setAmountProfitLoc(amountProfitLoc);
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		} else if (MagicValues.COST.equals(reportCode) && MagicValues.MEET_BILL.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
-			AeaBills bills = aeaBillsService.getById(billId);
-			if (bills != null) {
-//				bills.setFM(MagicValues.FM);
-//				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
-				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSrcType(), AuthUtil.getTenantId());
-				if (biz.isSuccess()) {
-					bills.setSrcType(biz.getData());
-				}
-				List<FeeCenter> feeCenterList;
-				List<Long> ids = new ArrayList<>();
-				if (MagicValues.MM.equals(bills.getBillType())) {
-					List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
-						.eq(Bills::getTenantId, AuthUtil.getTenantId())
-						.eq(Bills::getIsDeleted, 0)
-						.eq(Bills::getMasterId, bills.getId())
-						.eq(Bills::getMasterBillNo, bills.getBillNo()));
-					if (!billsList.isEmpty()) {
-						ids = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-					}
-				}
-				ids.add(0, bills.getId());
-				LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-					.eq(FeeCenter::getDc, MagicValues.C)
-					.eq(FeeCenter::getAccStatus, 1)
-					.eq(FeeCenter::getIsDeleted, 0);
-				lambdaQueryWrapper.in(FeeCenter::getPid, ids);
-				if (ObjectUtils.isNotNull(corpIds)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCorpId, corpIds);
-				} else {
-					if (ObjectUtils.isNotNull(itemIds)) {
-						lambdaQueryWrapper.apply("find_in_set(id,'" + itemIds + "')");
-					}
-				}
-				if (ObjectUtils.isNotNull(curCode)) {
-					lambdaQueryWrapper.eq(FeeCenter::getCurCode, curCode);
-				}
-				feeCenterList = feeCenterService.list(lambdaQueryWrapper);
-				BigDecimal amountDr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCr = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfit;
-				BigDecimal amountDrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrUsd = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitUsd;
-				BigDecimal amountDrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountCrLoc = new BigDecimal(MagicValues.ZERO);
-				BigDecimal amountProfitLoc;
-				List<FeeCenterReports> feeCenterReportsList = new ArrayList<>();
-				for (FeeCenter item : feeCenterList) {
-					if (ObjectUtils.isNotNull(item.getShortName())) {
-						item.setCorpCnName(item.getShortName());
-					} else {
-						item.setCorpCnName("无");
-					}
-					if (ObjectUtils.isNotNull(item.getBillShortName())) {
-						item.setBillCorpCnName(item.getBillShortName());
-					} else {
-						item.setBillCorpCnName("无");
-					}
-					if (MagicValues.D.equals(item.getDc())) {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountDrUsd = amountDrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountDr = amountDr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountDrUsd = amountDrUsd.add(usd);
-						}
-					} else {
-						if (MagicValues.USD.equals(item.getCurCode())) {
-							amountCrUsd = amountCrUsd.add(item.getAmount());
-						} else if (MagicValues.CNY.equals(item.getCurCode())) {
-							amountCr = amountCr.add(item.getAmount());
-						} else {
-							BigDecimal usd = ibCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
-							amountCrUsd = amountCrUsd.add(usd);
-						}
-					}
-					FeeCenterReports feeCenterReports = new FeeCenterReports();
-					feeCenterReports.setRemarks(item.getRemarks());
-					feeCenterReports.setPid(item.getPid());
-					feeCenterReports.setCorpCnName(item.getCorpCnName());
-					feeCenterReports.setBillCorpCnName(item.getBillCorpCnName());
-					feeCenterReports.setFeeCnName(item.getFeeCnName());
-					if (MagicValues.CNY.equals(item.getCurCode())) {
-						feeCenterReports.setAmountC(item.getAmount());
-					} else {
-						feeCenterReports.setAmountUsdC(item.getAmount());
-					}
-					feeCenterReports.setAmountLocC(item.getAmountLoc());
-					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
-					feeCenterReportsList.add(feeCenterReports);
-				}
-				if (!feeCenterList.isEmpty()) {
-					bills.setTo(feeCenterList.get(0).getCorpCnName());
-					bills.setAccNo(feeCenterList.stream().map(FeeCenter::getAccBillNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(",")));
-				}
-				bills.setFeeCenterList(feeCenterReportsList);
-				amountProfit = amountDr.subtract(amountCr);
-				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountDrUsd, MagicValues.D, "1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(ibCurrencyService.converterCny(MagicValues.USD, amountCrUsd, MagicValues.C, "1")).add(amountCr);
-				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
-				bills.setAmountDr(amountDr);
-				bills.setAmountCr(amountCr);
-				bills.setAmountProfit(amountProfit);
-				bills.setAmountDrUsd(amountDrUsd);
-				bills.setAmountCrUsd(amountCrUsd);
-				bills.setAmountProfitUsd(amountProfitUsd);
-				bills.setAmountDrLoc(amountDrLoc);
-				bills.setAmountCrLoc(amountCrLoc);
-				bills.setAmountProfitLoc(amountProfitLoc);
-				bills.setDept(dept);
-				map.put(MagicValues.DATA, bills);
-			} else {
-				map.put(MagicValues.DATA, null);
-			}
-		}
-		return R.data(map);
-	}
-
 	public R<Map<String, Object>> getReportDataAmend(String billId, String reportCode, String groupCode, String corpIds,
 													 String itemIds, String type, String curCode) {
 		Map<String, Object> map = new HashMap<>();

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/box/controller/PutBoxController.java

@@ -190,7 +190,7 @@ public class PutBoxController extends BladeController {
 		lambdaQueryWrapper.eq(PutBox::getTenantId, AuthUtil.getTenantId())
 			.eq(PutBox::getIsDeleted, 0)
 			.eq(PutBox::getBoxType, putBox.getBoxType())
-			.apply("remaining_num != 0")
+			.apply("remaining_num > 0")
 			.like(ObjectUtils.isNotNull(putBox.getPodId()), PutBox::getPodId, putBox.getPodId())
 			.like(ObjectUtils.isNotNull(putBox.getPolId()), PutBox::getPolId, putBox.getPolId())
 			.orderByAsc(PutBox::getPriorityLevel);

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

@@ -123,7 +123,7 @@ public class BillsController extends BladeController {
 		}
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -138,6 +138,7 @@ public class BillsController extends BladeController {
 			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()));
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBranchId()),Bills::getBranchId, bills.getBranchId());
 		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
@@ -265,7 +266,7 @@ public class BillsController extends BladeController {
 		}
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -280,6 +281,7 @@ public class BillsController extends BladeController {
 			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()));
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBranchId()),Bills::getBranchId, bills.getBranchId());
 		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))
@@ -632,16 +634,9 @@ 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());
-		} 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("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -656,6 +651,7 @@ public class BillsController extends BladeController {
 			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()));
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBranchId()),Bills::getBranchId, bills.getBranchId());
 		}
 		lambdaQueryWrapper.and(ObjectUtils.isNotNull(bills.getBookingAgentCnName()), i -> i.like(Bills::getBookingAgentCnName, bills.getBookingAgentCnName()).or()
 				.like(Bills::getBookingAgentEnName, bills.getBookingAgentCnName()))

+ 76 - 1
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -35,8 +35,10 @@ import org.springblade.los.Util.StringTools;
 import org.springblade.los.Util.ZrUtil;
 import org.springblade.los.basic.business.entity.BusinessType;
 import org.springblade.los.basic.business.service.IBusinessTypeService;
+import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.entity.BCorpsAttn;
 import org.springblade.los.basic.corps.mapper.CorpsAttnMapper;
+import org.springblade.los.basic.corps.mapper.CorpsMapper;
 import org.springblade.los.basic.cur.entity.BCurrency;
 import org.springblade.los.basic.cur.service.IBCurrencyService;
 import org.springblade.los.basic.vessels.entity.BVessels;
@@ -73,12 +75,12 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.Year;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -135,6 +137,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 
 	private final CorpsAttnMapper corpsAttnMapper;
 
+	private final CorpsMapper corpsMapper;
+
 	private final IHmmEdiService hmmEdiService;
 
 	private final ZrUtil zrUtil;
@@ -271,6 +275,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setTenantId(AuthUtil.getTenantId());
 			if (ObjectUtils.isNotNull(branchId)) {
 				bills.setBranchId(branchId);
+				bills.setBranchName(deptName);
 				bills.setCreateDept(deptId);
 				bills.setCreateDeptName(deptName);
 			}
@@ -747,6 +752,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			}
 			seaContainerNumberItemService.saveOrUpdateBatch(bills.getContainerNumberItemList());
 		}
+		//应结日期计算
+		if ("SE".equals(bills.getBusinessType())) {
+			bills.setDueDate(this.dueDate(bills));
+		}
 		this.updateById(bills);
 		String openZr = sysClient.getParamService(CommonEnum.OPEN_ZR_TRANSMIT.info);
 		if (Objects.equals(CommonEnum.ONE.info, openZr)) {
@@ -756,6 +765,49 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		return R.data(bills);
 	}
 
+	private Date dueDate(Bills bills) {
+		BCorps corps = corpsMapper.selectById(bills.getCorpId());
+		if (corps == null) {
+			throw new RuntimeException("未查到客户信息");
+		}
+		Date date1;
+		if (ObjectUtils.isNotNull(bills.getActualEtd())) {
+			date1 = bills.getActualEtd();
+		} else {
+			date1 = bills.getEtd();
+		}
+		LocalDate localDate = date1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+		int year = localDate.getYear();
+		int month = localDate.getMonthValue();
+		int days = Integer.parseInt(corps.getSettlementDays());
+		if (month == 12) {
+			year = year + 1;
+			month = Integer.parseInt(corps.getSettlementMonth());
+		} else {
+			if (month + Integer.parseInt(corps.getSettlementMonth()) > 12) {
+				year = year + 1;
+				month = month + Integer.parseInt(corps.getSettlementMonth()) - 12;
+			} else {
+				month = month + Integer.parseInt(corps.getSettlementMonth());
+			}
+		}
+		if (month == 2) {
+			if (Year.isLeap(year)) {
+				if (days > 29) {
+					days = 29;
+				}
+			} else {
+				if (days > 28) {
+					days = 28;
+				}
+			}
+		}
+		LocalDate newDate = localDate.withYear(year)
+			.withMonth(month)
+			.withDayOfMonth(days);
+		return Date.from(newDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+	}
+
 	private void synchronous(Bills bills) {
 		if ("MM".equals(bills.getBillType())) {
 			Bills details = baseMapper.selectById(bills.getId());
@@ -2604,6 +2656,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					item.setTenantId(AuthUtil.getTenantId());
 					if (ObjectUtils.isNotNull(branchId)) {
 						item.setBranchId(branchId);
+						item.setBranchName(deptName);
 						item.setCreateDept(deptId);
 						item.setCreateDeptName(deptName);
 					}
@@ -3169,6 +3222,28 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		auditPathsLevels = auditPathsLevelsService.list(new LambdaQueryWrapper<LosAuditPathsLevels>()
 			.eq(LosAuditPathsLevels::getTenantId, AuthUtil.getTenantId()).eq(LosAuditPathsLevels::getPathId, pathId));
 		for (Bills declare : billsList) {
+			String texts = "";
+			if (ObjectUtils.isNull(declare.getMblno())) {
+				texts = texts + "提单号、";
+			}
+			if (ObjectUtils.isNull(declare.getVesselId())) {
+				texts = texts + "船名、";
+			}
+			if (ObjectUtils.isNull(declare.getVoyageNo())) {
+				texts = texts + "航次、";
+			}
+			if (ObjectUtils.isNull(declare.getPodId())) {
+				texts = texts + "卸货港、";
+			}
+			if (ObjectUtils.isNull(declare.getCarrierId())) {
+				texts = texts + "船公司、";
+			}
+			if (ObjectUtils.isNull(declare.getCyId())) {
+				texts = texts + "场站、";
+			}
+			if (ObjectUtils.isNotNull(texts)) {
+				throw new RuntimeException("单号:" + declare.getBillNo() + "," + texts + "不能为空");
+			}
 			//审批数据
 			LosAuditProecessDTO auditProecessDTO = new LosAuditProecessDTO();
 			auditProecessDTO.setTimes(1);

+ 0 - 2
blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java

@@ -3102,8 +3102,6 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				data.setSrcEnName(item.getSrcEnName());
 				data.setSrcType(item.getSrcType());
 				data.setPaymode(item.getPaymode());
-				data.setAccelementid(item.getElementsId());
-				data.setAccelementname(item.getElementsCnName());
 				data.setCorpId(item.getCorpId());
 				data.setCorpCnName(item.getCorpCnName());
 				data.setCorpEnName(item.getCorpEnName());

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FeeCenterController.java

@@ -241,7 +241,7 @@ public class FeeCenterController extends BladeController {
 	@GetMapping("/templateImportBatch")
 	@RepeatSubmit
 	public R templateImportBatch(@RequestParam("billsIds") String billsIds,@RequestParam("templateId") String templateId
-		,@RequestParam("dc") String dc) {
+		,@RequestParam(value = "dc",required = false) String dc) {
 		return feeCenterService.templateImportBatch(billsIds,templateId,dc);
 	}
 

+ 22 - 13
blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -170,12 +170,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				int count = 1;
 				for (FeesTemplateItems items : losBFeesTemplate.getFeesTemplateItemsList()) {
 					FeeCenter feeCenter = new FeeCenter();
-
-					feeCenter.setElementsCnName(items.getElementsCnName());
-					feeCenter.setElementsEnName(items.getElementsEnName());
-					feeCenter.setElementsId(items.getElementsId());
-					feeCenter.setElementsCode(items.getElementsCode());
-
 					feeCenter.setPid(bills.getId());
 					feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
 					feeCenter.setBillNo(bills.getBillNo());
@@ -846,7 +840,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			.eq(FeesTemplateItems::getTenantId, AuthUtil.getTenantId())
 			.eq(FeesTemplateItems::getIsDeleted, 0)
 			.eq(FeesTemplateItems::getPid, templateId)
-			.eq(FeesTemplateItems::getDc, dc));
+			.eq(ObjectUtils.isNotNull(dc), FeesTemplateItems::getDc, dc));
 		if (feesTemplateItemsList.isEmpty()) {
 			throw new RuntimeException("未查到模板明细");
 		}
@@ -854,14 +848,13 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			.eq(FeesTemplateSonItems::getTenantId, AuthUtil.getTenantId())
 			.eq(FeesTemplateSonItems::getIsDeleted, 0)
 			.in(FeesTemplateSonItems::getPpid, feesTemplateItemsList.stream().map(FeesTemplateItems::getId).collect(Collectors.toList()))
-			.eq(FeesTemplateSonItems::getDc, dc));
+			.eq(ObjectUtils.isNotNull(dc), FeesTemplateSonItems::getDc, dc));
 		if (sonItemsList.isEmpty()) {
 			throw new RuntimeException("未查到模板明细");
 		}
 		List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
-			.eq(Bills::getBranchId, AuthUtil.getTenantId())
 			.apply("find_in_set(id,'" + billsIds + "')"));
 		if (billsList.isEmpty()) {
 			throw new RuntimeException("未查到单据信息");
@@ -873,6 +866,25 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 		List<FeeCenter> list = new ArrayList<>();
 		StringBuilder text = new StringBuilder();
 		for (Bills bills : billsList) {
+			String texts = "";
+			if (ObjectUtils.isNull(bills.getMblno())) {
+				texts = texts + "提单号、";
+			}
+			if (ObjectUtils.isNull(bills.getVesselId())) {
+				texts = texts + "船名、";
+			}
+			if (ObjectUtils.isNull(bills.getVoyageNo())) {
+				texts = texts + "航次、";
+			}
+			if (ObjectUtils.isNull(bills.getPodId())) {
+				texts = texts + "卸货港、";
+			}
+			if (ObjectUtils.isNull(bills.getCarrierId())) {
+				texts = texts + "船公司、";
+			}
+			if (ObjectUtils.isNotNull(texts)) {
+				throw new RuntimeException("单号:" + bills.getBillNo() + "," + texts + "不能为空");
+			}
 			List<PreContainers> preContainers = new ArrayList<>();
 			if (!preContainersList.isEmpty()) {
 				preContainers = preContainersList.stream().filter(e -> e.getPid().equals(bills.getId())).collect(Collectors.toList());
@@ -885,10 +897,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					throw new RuntimeException("模版数据错误,请联系管理员");
 				}
 				FeeCenter feeCenter = new FeeCenter();
-				feeCenter.setElementsCnName(templateItems.getElementsCnName());
-				feeCenter.setElementsEnName(templateItems.getElementsEnName());
-				feeCenter.setElementsId(templateItems.getElementsId());
-				feeCenter.setElementsCode(templateItems.getElementsCode());
 				feeCenter.setPid(bills.getId());
 				feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
 				feeCenter.setBillNo(bills.getBillNo());
@@ -959,6 +967,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setShortName(templateItems.getCorpCnName());
 				}
 				feeCenter.setFeeId(items.getFeeId());
+				feeCenter.setCorpType(items.getType());
 				feeCenter.setFeeCode(items.getFeeCode());
 				feeCenter.setFeeCnName(items.getFeeCnName());
 				feeCenter.setFeeEnName(items.getFeeEnName());

+ 4 - 17
blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -140,7 +140,6 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 		}
 		List<Bills> billsList = new ArrayList<>();
 		List<Long> ids = finAccBills.getFeeCenterList().stream().map(FeeCenter::getPid).collect(Collectors.toList());
-		String status = sysClient.getParamService("generate.billing.rules");
 		for (FeeCenter item : finAccBills.getFeeCenterList()) {
 			if (1 == item.getAccStatus()) {
 				throw new RuntimeException("费用:" + item.getFeeCnName() + "已生成账单");
@@ -149,22 +148,12 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			if (new BigDecimal("0.00").compareTo(item.getAmount()) > 0) {
 				amountStatus = false;
 			}
-			if ("1".equals(status)) {
-				if (ObjectUtils.isNotNull(item.getPid()) && ObjectUtils.isNotNull(item.getCorpId()) &&
-					ObjectUtils.isNotNull(item.getDc()) && ObjectUtils.isNotNull(item.getElementsId()) && ObjectUtils.isNotNull(item.getCurCode())) {
-					item.setBillKey(item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + amountStatus);
-				} else {
-					throw new RuntimeException("单据号、单位、费用类型、核算要素不能为空");
-				}
+			if (ObjectUtils.isNotNull(item.getPid()) && ObjectUtils.isNotNull(item.getCorpId()) &&
+				ObjectUtils.isNotNull(item.getDc()) && ObjectUtils.isNotNull(item.getFeeId()) && ObjectUtils.isNotNull(item.getCurCode())) {
+				item.setBillKey(item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + amountStatus);
 			} else {
-				if (ObjectUtils.isNotNull(item.getPid()) && ObjectUtils.isNotNull(item.getCorpId()) &&
-					ObjectUtils.isNotNull(item.getDc()) && ObjectUtils.isNotNull(item.getFeeId()) && ObjectUtils.isNotNull(item.getCurCode())) {
-					item.setBillKey(item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + amountStatus);
-				} else {
-					throw new RuntimeException("单据号、单位、费用类型、费用名称不能为空");
-				}
+				throw new RuntimeException("单据号、单位、费用类型、费用名称不能为空");
 			}
-
 		}
 		BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()
 			.eq(BusinessType::getTenantId, AuthUtil.getTenantId())
@@ -247,8 +236,6 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			data.setOperatorName(bills.getOperatorName());
 			data.setQuantityCntrDescr(bills.getQuantityCntrDescr());
 			data.setPaymode(item.getPaymode());
-			data.setAccelementid(item.getElementsId());
-			data.setAccelementname(item.getElementsCnName());
 			data.setCorpId(item.getCorpId());
 			data.setCorpCnName(item.getCorpCnName());
 			data.setCorpEnName(item.getCorpEnName());

+ 15 - 15
blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -88,7 +88,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		financeProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			financeProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					financeProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){
@@ -313,7 +313,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.le(Bills::getBillDate, dateEnd);
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -334,7 +334,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.le(Bills::getBillDate, dateEnd);
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapperSI.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapperSI.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -386,7 +386,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -408,7 +408,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapperSI.eq(Bills::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapperSI.eq(Bills::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -431,7 +431,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			amendsLambdaQueryWrapper.eq(Amends::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					amendsLambdaQueryWrapper.eq(Amends::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -453,7 +453,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			amendsLambdaQueryWrapper.eq(Amends::getBranchId, AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")) {
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					amendsLambdaQueryWrapper.eq(Amends::getSrcId, AuthUtil.getUserId());
 				} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -489,7 +489,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 				.le(Bills::getBillDate, dateEnd);
 			if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 				lambdaQueryWrapperSE.eq(Bills::getBranchId, AuthUtil.getDeptId());
-				if (!AuthUtil.getUserRole().contains("分公司经理")) {
+				if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 					if (AuthUtil.getUserRole().contains("业务员")) {
 						lambdaQueryWrapperSE.eq(Bills::getSrcId, AuthUtil.getUserId());
 					} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -545,7 +545,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			Long userId = null;
 			if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 				deptId = Long.parseLong(AuthUtil.getDeptId());
-				if (!AuthUtil.getUserRole().contains("分公司经理")) {
+				if (!AuthUtil.getUserRole().contains("secondaryAdmin")) {
 					if (AuthUtil.getUserRole().contains("业务员")) {
 						busType = "1";
 					} else if (AuthUtil.getUserRole().contains("操作员")) {
@@ -615,7 +615,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		financeProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			financeProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					financeProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){
@@ -833,7 +833,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		financeProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			financeProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					financeProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){
@@ -1048,7 +1048,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		boxNumberProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			boxNumberProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					boxNumberProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){
@@ -1110,7 +1110,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		boxNumberProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			boxNumberProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					boxNumberProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){
@@ -1212,7 +1212,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		boxNumberProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			boxNumberProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					boxNumberProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){
@@ -1274,7 +1274,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		boxNumberProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")){
 			boxNumberProfit.setBranchId(AuthUtil.getDeptId());
-			if (!AuthUtil.getUserRole().contains("分公司经理")){
+			if (!AuthUtil.getUserRole().contains("secondaryAdmin")){
 				if (AuthUtil.getUserRole().contains("业务员")) {
 					boxNumberProfit.setSelecType("4");
 				}else if (AuthUtil.getUserRole().contains("操作员")){

+ 2 - 0
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -251,9 +251,11 @@ public class DeptController extends BladeController {
 	public R<List<Dept>> getDeptList(@RequestParam(value = "id",required = false) Long id,
 									 @RequestParam(value = "polId",required = false) Long polId,
 									 @RequestParam(value = "deptName",required = false) String deptName,
+									 @RequestParam(value = "isHq",required = false) String isHq,
 									 @RequestParam(value = "fullName",required = false) String fullName) {
 		List<Dept> deptList = deptService.list(new LambdaQueryWrapper<Dept>()
 			.eq(ObjectUtils.isNotNull(id), Dept::getId, id)
+			.eq(ObjectUtils.isNotNull(isHq), Dept::getIsHq, isHq)
 			.like(ObjectUtils.isNotNull(polId), Dept::getPolId, polId)
 			.like(ObjectUtils.isNotNull(deptName), Dept::getDeptName, deptName)
 			.like(ObjectUtils.isNotNull(fullName), Dept::getFullName, fullName)