2024年2月22日17:31:16

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -35,6 +35,7 @@ public interface LauncherConstant {
 	 * weChat
 	 */
 	String APPLICATION_WECHAT_NAME = APPLICATION_NAME_PREFIX + "weChat";
+	String APPLICATION_LOS_NAME = APPLICATION_NAME_PREFIX + "los";
 	/**
 	 * PurchaseSales
 	 */

blade-service-api/blade-los-api/src/main/java/org/springblade/los/feign/ILosClient.java

@@ -6,7 +6,7 @@ import org.springblade.los.billno.entity.BusinessBillNo;
 import org.springblade.los.check.entity.LosAuditPaths;
 import org.springblade.los.check.entity.LosAuditPathsActs;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -19,7 +19,7 @@ import java.util.List;
 	value = "blade-los"
 )
 public interface ILosClient {
-	String API_PREFIX = "/blade-los";
+	String API_PREFIX = "/client";
 	String GET_LOS_AUDIT_PATHS = API_PREFIX + "/getLosAuditPaths";
 	String GET_LOS_AUDIT_PATHS_ACTS = API_PREFIX + "/getLosAuditPathsActs";
 	String ADD_LOS_AUDIT_PATHS_LIST = API_PREFIX + "/addLosAuditPathsList";
@@ -33,48 +33,48 @@ public interface ILosClient {
 	/**
 	 * 审批流配置主表实体类
 	 */
-	@GetMapping(GET_LOS_AUDIT_PATHS)
+	@PostMapping(GET_LOS_AUDIT_PATHS)
 	List<LosAuditPaths> getLosAuditPaths(@RequestBody LosAuditPaths losAuditPaths);
 
 	/**
 	 * 审批流配置明细表实体类
 	 */
-	@GetMapping(GET_LOS_AUDIT_PATHS_ACTS)
+	@PostMapping(GET_LOS_AUDIT_PATHS_ACTS)
 	List<LosAuditPathsActs> getLosAuditPathsActs(@RequestBody LosAuditPathsActs losAuditPathsActs);
 
 	/**
 	 * 保存审批流配置主表实体类
 	 */
-	@GetMapping(ADD_LOS_AUDIT_PATHS_LIST)
+	@PostMapping(ADD_LOS_AUDIT_PATHS_LIST)
 	R addLosAuditPathsList(@RequestBody List<LosAuditPaths> losAuditPathsList);
 
 	/**
 	 * 保存审批流配置明细表实体类
 	 */
-	@GetMapping(ADD_LOS_AUDIT_PATHS_ACTS_LIST)
+	@PostMapping(ADD_LOS_AUDIT_PATHS_ACTS_LIST)
 	R addLosAuditPathsActsList(@RequestBody List<LosAuditPathsActs> losAuditPathsActsList);
 
 	/**
 	 * 业务类型
 	 */
-	@GetMapping(GET_BUSINESS_TYPE)
+	@PostMapping(GET_BUSINESS_TYPE)
 	List<BusinessType> getBusinessType(@RequestBody BusinessType businessType);
 
 	/**
 	 * 业务类型编号格式
 	 */
-	@GetMapping(GET_BUSINESS_BILL_NO)
+	@PostMapping(GET_BUSINESS_BILL_NO)
 	List<BusinessBillNo> getBusinessBillNo(@RequestBody BusinessBillNo businessBillNo);
 
 	/**
 	 * 保存业务类型
 	 */
-	@GetMapping(ADD_BUSINESS_TYPE)
+	@PostMapping(ADD_BUSINESS_TYPE)
 	R addBusinessTypeList(@RequestBody List<BusinessType> businessTypeList);
 
 	/**
 	 * 保存业务类型编号格式
 	 */
-	@GetMapping(ADD_BUSINESS_BILL_NO)
+	@PostMapping(ADD_BUSINESS_BILL_NO)
 	R addBusinessBillNoList(@RequestBody List<BusinessBillNo> businessBillNoList);
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/vouchers/entity/FinVouchers.java

@@ -254,6 +254,7 @@ public class FinVouchers implements Serializable {
 	/**
 	 * 业务-财务凭证分录
 	 */
+	@TableField(exist = false)
 	private List<FinVouchersItems> finVouchersItemsList;
 
 	/**

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

@@ -188,6 +188,18 @@ public class Dept implements Serializable {
 	private String bankAddress;
 
 	/**
+	 * 开户银行美金
+	 */
+	@ApiModelProperty(value = "开户银行美金")
+	private String bankOfDepositUsd;
+
+	/**
+	 * 银行地址美金
+	 */
+	@ApiModelProperty(value = "银行地址美金")
+	private String bankAddressUsd;
+
+	/**
 	 * 人民币账号
 	 */
 	@ApiModelProperty(value = "人民币账号")

blade-service/blade-los/src/main/java/org/springblade/los/LosApplication.java

@@ -21,7 +21,6 @@ import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 启动器
@@ -31,7 +30,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableBladeFeign
 @SpringCloudApplication
 @SeataCloudApplication
-@EnableFeignClients({"org.springblade", "org.springblade.los.*"})
 public class LosApplication {
 
 	public static void main(String[] args) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/ContainersServiceImpl.java

@@ -291,8 +291,8 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 			|| new BigDecimal("0").compareTo(containers.getWaitingBox().getQuantity()) == 0) {
 			throw new RuntimeException("待分配件数不能为空或不能为零");
 		}
-		if (containersList.size() == 0) {
-			throw new RuntimeException("待分配箱量为零，操作失败");
+		if (containersList.isEmpty()) {
+			throw new RuntimeException("待分配箱数据为空，操作失败");
 		}
 		BigDecimal teu = new BigDecimal(containersList.size());
 		if (new BigDecimal("0").compareTo(teu) == 0) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/PreContainersServiceImpl.java

@@ -217,6 +217,8 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submitList(List<PreContainers> preContainersList) {
 		String deptId = "";
 		String deptName = "";
@@ -229,11 +231,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 				deptName = String.join(",", res.getData());
 			}
 		}
-		Bills bills = billsMapper.selectOne(new LambdaQueryWrapper<Bills>()
-			.select(Bills::getId, Bills::getCfsMeasurement, Bills::getCfsGrossWeight, Bills::getCfsQuantity
-				, Bills::getUpdateUser, Bills::getUpdateTime, Bills::getUpdateUserName, Bills::getTeu, Bills::getQuantity
-				, Bills::getMeasurement, Bills::getGrossWeight)
-			.eq(Bills::getId, preContainersList.get(0).getPid()));
+		Bills bills = billsMapper.selectById(preContainersList.get(0).getPid());
 		if (bills != null) {
 			bills.setCfsMeasurement(new BigDecimal("0.00"));
 			bills.setCfsGrossWeight(new BigDecimal("0.00"));
@@ -280,7 +278,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 				.eq(Containers::getIsDeleted, 0)
 				.eq(Containers::getPid, preContainers.getPid()));
 			containersService.removeByPid(preContainers.getPid(), preContainers.getCntrTypeCode());
-			if (removeContainersList.size() > 0) {
+			if (!removeContainersList.isEmpty()) {
 				List<Long> ids = removeContainersList.stream().map(Containers::getId).collect(Collectors.toList());
 				containersBillsService.removeByPid(ids);
 			}
@@ -320,7 +318,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 				containersList.add(containers);
 			}
 		}
-		if (containersList.size() > 0) {
+		if (!containersList.isEmpty()) {
 			containersService.saveOrUpdateBatch(containersList);
 		}
 		return R.data(containersList);

blade-service/blade-los/src/main/java/org/springblade/los/feign/LosClient.java

@@ -13,14 +13,14 @@ import org.springblade.los.check.entity.LosAuditPaths;
 import org.springblade.los.check.entity.LosAuditPathsActs;
 import org.springblade.los.check.service.IAuditPathsActsService;
 import org.springblade.los.check.service.IAuditPathsService;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
 @NonDS
-@ApiIgnore()
+@ApiIgnore
 @RestController
 @AllArgsConstructor
 public class LosClient implements ILosClient {
@@ -36,15 +36,17 @@ public class LosClient implements ILosClient {
 
 	@Override
 	@TenantIgnore
-	@GetMapping(GET_LOS_AUDIT_PATHS)
+	@PostMapping(GET_LOS_AUDIT_PATHS)
 	public List<LosAuditPaths> getLosAuditPaths(LosAuditPaths losAuditPaths) {
 		return auditPathsService.list(new LambdaQueryWrapper<LosAuditPaths>()
-			.eq(LosAuditPaths::getTenantId, losAuditPaths.getTenantId()));
+			.eq(LosAuditPaths::getTenantId, losAuditPaths.getTenantId())
+			.eq(LosAuditPaths::getSalesCompanyId, losAuditPaths.getSalesCompanyId())
+		);
 	}
 
 	@Override
 	@TenantIgnore
-	@GetMapping(GET_LOS_AUDIT_PATHS_ACTS)
+	@PostMapping(GET_LOS_AUDIT_PATHS_ACTS)
 	public List<LosAuditPathsActs> getLosAuditPathsActs(LosAuditPathsActs losAuditPathsActs) {
 		return auditPathsActsService.list(new LambdaQueryWrapper<LosAuditPathsActs>()
 			.eq(LosAuditPathsActs::getTenantId, losAuditPathsActs.getTenantId()));
@@ -52,21 +54,21 @@ public class LosClient implements ILosClient {
 
 	@Override
 	@TenantIgnore
-	@GetMapping(ADD_LOS_AUDIT_PATHS_LIST)
+	@PostMapping(ADD_LOS_AUDIT_PATHS_LIST)
 	public R addLosAuditPathsList(List<LosAuditPaths> losAuditPathsList) {
 		return R.data(auditPathsService.saveOrUpdateBatch(losAuditPathsList));
 	}
 
 	@Override
 	@TenantIgnore
-	@GetMapping(ADD_LOS_AUDIT_PATHS_ACTS_LIST)
+	@PostMapping(ADD_LOS_AUDIT_PATHS_ACTS_LIST)
 	public R addLosAuditPathsActsList(List<LosAuditPathsActs> losAuditPathsActsList) {
 		return R.data(auditPathsActsService.saveOrUpdateBatch(losAuditPathsActsList));
 	}
 
 	@Override
 	@TenantIgnore
-	@GetMapping(GET_BUSINESS_TYPE)
+	@PostMapping(GET_BUSINESS_TYPE)
 	public List<BusinessType> getBusinessType(BusinessType businessType) {
 		return bBusinessTypeService.list(new LambdaQueryWrapper<BusinessType>()
 			.eq(BusinessType::getTenantId, businessType.getTenantId()));
@@ -74,22 +76,24 @@ public class LosClient implements ILosClient {
 
 	@Override
 	@TenantIgnore
-	@GetMapping(GET_BUSINESS_BILL_NO)
+	@PostMapping(GET_BUSINESS_BILL_NO)
 	public List<BusinessBillNo> getBusinessBillNo(BusinessBillNo businessBillNo) {
 		return businessBillNoService.list(new LambdaQueryWrapper<BusinessBillNo>()
-			.eq(BusinessBillNo::getTenantId, businessBillNo.getTenantId()));
+			.eq(BusinessBillNo::getTenantId, businessBillNo.getTenantId())
+			.eq(BusinessBillNo::getBranchId, businessBillNo.getBranchId())
+		);
 	}
 
 	@Override
 	@TenantIgnore
-	@GetMapping(ADD_BUSINESS_TYPE)
+	@PostMapping(ADD_BUSINESS_TYPE)
 	public R addBusinessTypeList(List<BusinessType> businessTypeList) {
 		return R.data(bBusinessTypeService.saveOrUpdateBatch(businessTypeList));
 	}
 
 	@Override
 	@TenantIgnore
-	@GetMapping(ADD_BUSINESS_BILL_NO)
+	@PostMapping(ADD_BUSINESS_BILL_NO)
 	public R addBusinessBillNoList(List<BusinessBillNo> businessBillNoList) {
 		return R.data(businessBillNoService.saveOrUpdateBatch(businessBillNoList));
 	}

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

@@ -28,6 +28,7 @@ import org.springblade.los.statisticAnalysis.service.IStatisticAnalysisService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.DateFormat;
 import java.text.NumberFormat;
@@ -272,8 +273,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
-			.lt(Bills::getBillDate, dateStart)
-			.gt(Bills::getBillDate, dateEnd);
+			.ge(Bills::getBillDate, dateStart)
+			.le(Bills::getBillDate, dateEnd);
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
@@ -282,14 +283,25 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		lambdaQueryWrapper.eq(Bills::getBusinessType, "SE");
 		HYCK = billsMapper.selectCount(lambdaQueryWrapper);
-		lambdaQueryWrapper.eq(Bills::getBusinessType, "SI");
-		HYJK = billsMapper.selectCount(lambdaQueryWrapper);
+		LambdaQueryWrapper<Bills> lambdaQueryWrapperSI = new LambdaQueryWrapper<>();
+		lambdaQueryWrapperSI.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+			.ge(Bills::getBillDate, dateStart)
+			.le(Bills::getBillDate, dateEnd);
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			lambdaQueryWrapperSI.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapperSI.eq(Bills::getBranchId, deptUtils.getDeptPid());
+		}
+		lambdaQueryWrapperSI.eq(Bills::getBusinessType, "SI");
+		HYJK = billsMapper.selectCount(lambdaQueryWrapperSI);
 
 		LambdaQueryWrapper<AeaBills> aeaBillsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		aeaBillsLambdaQueryWrapper.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
 			.eq(AeaBills::getIsDeleted, 0)
-			.lt(AeaBills::getBillDate, dateStart)
-			.gt(AeaBills::getBillDate, dateEnd);
+			.le(AeaBills::getBillDate, dateEnd)
+			.ge(AeaBills::getBillDate, dateStart);
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			aeaBillsLambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
@@ -298,8 +310,19 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		aeaBillsLambdaQueryWrapper.eq(AeaBills::getBusinessType, "AE");
 		KYCK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapper);
-		aeaBillsLambdaQueryWrapper.eq(AeaBills::getBusinessType, "AI");
-		KYJK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapper);
+		LambdaQueryWrapper<AeaBills> aeaBillsLambdaQueryWrapperAI = new LambdaQueryWrapper<>();
+		aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
+			.eq(AeaBills::getIsDeleted, 0)
+			.le(AeaBills::getBillDate, dateEnd)
+			.ge(AeaBills::getBillDate, dateStart);
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			aeaBillsLambdaQueryWrapperAI.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getBranchId, deptUtils.getDeptPid());
+		}
+		aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getBusinessType, "AI");
+		KYJK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapperAI);
 		Map<String, Object> map = new HashMap<>();
 		map.put("HYJK", HYJK);
 		map.put("HYCK", HYCK);
@@ -328,8 +351,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
-			.lt(Bills::getBillDate, dateStart)
-			.gt(Bills::getBillDate, dateEnd)
+			.ge(Bills::getBillDate, dateStart)
+			.le(Bills::getBillDate, dateEnd)
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
@@ -339,15 +362,27 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		lambdaQueryWrapper.eq(Bills::getBusinessType, "SE");
 		HYCK = billsMapper.selectCount(lambdaQueryWrapper);
-		lambdaQueryWrapper.eq(Bills::getBusinessType, "SI");
-		HYJK = billsMapper.selectCount(lambdaQueryWrapper);
+		LambdaQueryWrapper<Bills> lambdaQueryWrapperSI = new LambdaQueryWrapper<>();
+		lambdaQueryWrapperSI.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+			.ge(Bills::getBillDate, dateStart)
+			.le(Bills::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			lambdaQueryWrapperSI.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapperSI.eq(Bills::getBranchId, deptUtils.getDeptPid());
+		}
+		lambdaQueryWrapperSI.eq(Bills::getBusinessType, "SI");
+		HYJK = billsMapper.selectCount(lambdaQueryWrapperSI);
 
 		//空运进出口
 		LambdaQueryWrapper<AeaBills> aeaBillsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		aeaBillsLambdaQueryWrapper.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
 			.eq(AeaBills::getIsDeleted, 0)
-			.lt(AeaBills::getBillDate, dateStart)
-			.gt(AeaBills::getBillDate, dateEnd)
+			.ge(AeaBills::getBillDate, dateStart)
+			.le(AeaBills::getBillDate, dateEnd)
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			aeaBillsLambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
@@ -357,15 +392,27 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		aeaBillsLambdaQueryWrapper.eq(AeaBills::getBusinessType, "AE");
 		KYCK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapper);
-		aeaBillsLambdaQueryWrapper.eq(AeaBills::getBusinessType, "AI");
-		KYJK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapper);
+		LambdaQueryWrapper<AeaBills> aeaBillsLambdaQueryWrapperAI = new LambdaQueryWrapper<>();
+		aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
+			.eq(AeaBills::getIsDeleted, 0)
+			.ge(AeaBills::getBillDate, dateStart)
+			.le(AeaBills::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			aeaBillsLambdaQueryWrapperAI.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getBranchId, deptUtils.getDeptPid());
+		}
+		aeaBillsLambdaQueryWrapperAI.eq(AeaBills::getBusinessType, "AI");
+		KYJK = aeaBillsMapper.selectCount(aeaBillsLambdaQueryWrapperAI);
 
 		//Amends 海、空运进出口
 		LambdaQueryWrapper<Amends> amendsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		amendsLambdaQueryWrapper.eq(Amends::getTenantId, AuthUtil.getTenantId())
 			.eq(Amends::getIsDeleted, 0)
-			.lt(Amends::getBillDate, dateStart)
-			.gt(Amends::getBillDate, dateEnd)
+			.ge(Amends::getBillDate, dateStart)
+			.le(Amends::getBillDate, dateEnd)
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			amendsLambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
@@ -375,19 +422,55 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		amendsLambdaQueryWrapper.eq(Amends::getBusinessType, "SEA");
 		SEA = amendsMapper.selectCount(amendsLambdaQueryWrapper);
-		amendsLambdaQueryWrapper.eq(Amends::getBusinessType, "SIA");
-		SIA = amendsMapper.selectCount(amendsLambdaQueryWrapper);
-		amendsLambdaQueryWrapper.eq(Amends::getBusinessType, "AEA");
-		AEA = amendsMapper.selectCount(amendsLambdaQueryWrapper);
-		amendsLambdaQueryWrapper.eq(Amends::getBusinessType, "AIA");
-		AIA = amendsMapper.selectCount(amendsLambdaQueryWrapper);
+		LambdaQueryWrapper<Amends> amendsLambdaQueryWrapperSIA = new LambdaQueryWrapper<>();
+		amendsLambdaQueryWrapperSIA.eq(Amends::getTenantId, AuthUtil.getTenantId())
+			.eq(Amends::getIsDeleted, 0)
+			.ge(Amends::getBillDate, dateStart)
+			.le(Amends::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			amendsLambdaQueryWrapperSIA.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			amendsLambdaQueryWrapperSIA.eq(Amends::getBranchId, deptUtils.getDeptPid());
+		}
+		amendsLambdaQueryWrapperSIA.eq(Amends::getBusinessType, "SIA");
+		SIA = amendsMapper.selectCount(amendsLambdaQueryWrapperSIA);
+		LambdaQueryWrapper<Amends> amendsLambdaQueryWrapperAEA = new LambdaQueryWrapper<>();
+		amendsLambdaQueryWrapperAEA.eq(Amends::getTenantId, AuthUtil.getTenantId())
+			.eq(Amends::getIsDeleted, 0)
+			.ge(Amends::getBillDate, dateStart)
+			.le(Amends::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			amendsLambdaQueryWrapperAEA.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			amendsLambdaQueryWrapperAEA.eq(Amends::getBranchId, deptUtils.getDeptPid());
+		}
+		amendsLambdaQueryWrapperAEA.eq(Amends::getBusinessType, "AEA");
+		AEA = amendsMapper.selectCount(amendsLambdaQueryWrapperAEA);
+		LambdaQueryWrapper<Amends> amendsLambdaQueryWrapperAIA = new LambdaQueryWrapper<>();
+		amendsLambdaQueryWrapperAIA.eq(Amends::getTenantId, AuthUtil.getTenantId())
+			.eq(Amends::getIsDeleted, 0)
+			.ge(Amends::getBillDate, dateStart)
+			.le(Amends::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			amendsLambdaQueryWrapperAIA.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			amendsLambdaQueryWrapperAIA.eq(Amends::getBranchId, deptUtils.getDeptPid());
+		}
+		amendsLambdaQueryWrapperAIA.eq(Amends::getBusinessType, "AIA");
+		AIA = amendsMapper.selectCount(amendsLambdaQueryWrapperAIA);
 
 		//报关 海、空运进出口
 		LambdaQueryWrapper<CustomsDeclaration> customsDeclarationLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		customsDeclarationLambdaQueryWrapper.eq(CustomsDeclaration::getTenantId, AuthUtil.getTenantId())
 			.eq(CustomsDeclaration::getIsDeleted, 0)
-			.lt(CustomsDeclaration::getBillDate, dateStart)
-			.gt(CustomsDeclaration::getBillDate, dateEnd)
+			.ge(CustomsDeclaration::getBillDate, dateStart)
+			.le(CustomsDeclaration::getBillDate, dateEnd)
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			customsDeclarationLambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
@@ -397,19 +480,55 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		}
 		customsDeclarationLambdaQueryWrapper.eq(CustomsDeclaration::getBusinessType, "BGSE");
 		BGSE = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapper);
-		customsDeclarationLambdaQueryWrapper.eq(CustomsDeclaration::getBusinessType, "BGSI");
-		BGSI = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapper);
-		customsDeclarationLambdaQueryWrapper.eq(CustomsDeclaration::getBusinessType, "BGAE");
-		BGAE = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapper);
-		customsDeclarationLambdaQueryWrapper.eq(CustomsDeclaration::getBusinessType, "BGAI");
-		BGAI = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapper);
+		LambdaQueryWrapper<CustomsDeclaration> customsDeclarationLambdaQueryWrapperBGSI = new LambdaQueryWrapper<>();
+		customsDeclarationLambdaQueryWrapperBGSI.eq(CustomsDeclaration::getTenantId, AuthUtil.getTenantId())
+			.eq(CustomsDeclaration::getIsDeleted, 0)
+			.ge(CustomsDeclaration::getBillDate, dateStart)
+			.le(CustomsDeclaration::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			customsDeclarationLambdaQueryWrapperBGSI.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			customsDeclarationLambdaQueryWrapperBGSI.eq(CustomsDeclaration::getBranchId, deptUtils.getDeptPid());
+		}
+		customsDeclarationLambdaQueryWrapperBGSI.eq(CustomsDeclaration::getBusinessType, "BGSI");
+		BGSI = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapperBGSI);
+		LambdaQueryWrapper<CustomsDeclaration> customsDeclarationLambdaQueryWrapperBGAE = new LambdaQueryWrapper<>();
+		customsDeclarationLambdaQueryWrapperBGAE.eq(CustomsDeclaration::getTenantId, AuthUtil.getTenantId())
+			.eq(CustomsDeclaration::getIsDeleted, 0)
+			.ge(CustomsDeclaration::getBillDate, dateStart)
+			.le(CustomsDeclaration::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			customsDeclarationLambdaQueryWrapperBGAE.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			customsDeclarationLambdaQueryWrapperBGAE.eq(CustomsDeclaration::getBranchId, deptUtils.getDeptPid());
+		}
+		customsDeclarationLambdaQueryWrapperBGAE.eq(CustomsDeclaration::getBusinessType, "BGAE");
+		BGAE = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapperBGAE);
+		LambdaQueryWrapper<CustomsDeclaration> customsDeclarationLambdaQueryWrapperBGAI = new LambdaQueryWrapper<>();
+		customsDeclarationLambdaQueryWrapperBGAI.eq(CustomsDeclaration::getTenantId, AuthUtil.getTenantId())
+			.eq(CustomsDeclaration::getIsDeleted, 0)
+			.ge(CustomsDeclaration::getBillDate, dateStart)
+			.le(CustomsDeclaration::getBillDate, dateEnd)
+			.apply("find_in_set(status,'1,2')");
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			customsDeclarationLambdaQueryWrapperBGAI.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			customsDeclarationLambdaQueryWrapperBGAI.eq(CustomsDeclaration::getBranchId, deptUtils.getDeptPid());
+		}
+		customsDeclarationLambdaQueryWrapperBGAI.eq(CustomsDeclaration::getBusinessType, "BGAI");
+		BGAI = customsDeclarationMapper.selectCount(customsDeclarationLambdaQueryWrapperBGAI);
 
 		//付费申请
 		LambdaQueryWrapper<FinStlBills> finStlBillsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		finStlBillsLambdaQueryWrapper.eq(FinStlBills::getTenantId, AuthUtil.getTenantId())
 			.eq(FinStlBills::getIsDeleted, 0)
-			.lt(FinStlBills::getBillDate, dateStart)
-			.gt(FinStlBills::getBillDate, dateEnd)
+			.ge(FinStlBills::getBillDate, dateStart)
+			.le(FinStlBills::getBillDate, dateEnd)
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			finStlBillsLambdaQueryWrapper.eq(FinStlBills::getBranchId, deptUtils.getDeptPid());
@@ -421,8 +540,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		LambdaQueryWrapper<FinInvoices> finInvoicesLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		finInvoicesLambdaQueryWrapper.eq(FinInvoices::getTenantId, AuthUtil.getTenantId())
 			.eq(FinInvoices::getIsDeleted, 0)
-			.lt(FinInvoices::getBillDate, dateStart)
-			.gt(FinInvoices::getBillDate, dateEnd)
+			.ge(FinInvoices::getBillDate, dateStart)
+			.le(FinInvoices::getBillDate, dateEnd)
 			.apply("find_in_set(status,'1,2')");
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			finInvoicesLambdaQueryWrapper.eq(FinInvoices::getBranchId, deptUtils.getDeptPid());
@@ -455,8 +574,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
-			.lt(Bills::getBillDate, dateStart)
-			.gt(Bills::getBillDate, dateEnd);
+			.ge(Bills::getBillDate, dateStart)
+			.le(Bills::getBillDate, dateEnd);
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
@@ -471,8 +590,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		LambdaQueryWrapper<AeaBills> aeaBillsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		aeaBillsLambdaQueryWrapper.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
 			.eq(AeaBills::getIsDeleted, 0)
-			.lt(AeaBills::getBillDate, dateStart)
-			.gt(AeaBills::getBillDate, dateEnd);
+			.ge(AeaBills::getBillDate, dateStart)
+			.le(AeaBills::getBillDate, dateEnd);
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
 			aeaBillsLambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
@@ -496,15 +615,10 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		map.put("sum", sum);
 		map.put("refurbishment", refurbishment);
 		map.put("complete", complete);
-		NumberFormat nf = NumberFormat.getNumberInstance();
-		nf.setMaximumFractionDigits(2);
-		nf.setMinimumFractionDigits(2);
-		nf.setRoundingMode(RoundingMode.HALF_UP);
-		nf.setGroupingUsed(false);
 		if (sum == 0) {
 			map.put("rate", 0);
 		} else {
-			map.put("rate", nf.format((complete / sum * 100)));
+			map.put("rate", new BigDecimal(complete).divide(new BigDecimal(sum), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")));
 		}
 		return R.data(map);
 	}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -44,6 +44,7 @@ import org.springblade.system.service.*;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.feign.IUserClient;
+import org.springblade.system.vo.DeptVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -231,6 +232,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			List<LosAuditPaths> losAuditPaths = new ArrayList<>();
 			LosAuditPaths losAuditPath = new LosAuditPaths();
 			losAuditPath.setTenantId(tenantIdCopy);
+			losAuditPath.setSalesCompanyId(1703929959275413506L);
 			List<LosAuditPaths> losAuditPathsList = losClient.getLosAuditPaths(losAuditPath);
 			for (LosAuditPaths item : losAuditPathsList) {
 				Long oldParentId = item.getId();
@@ -246,6 +248,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			List<BusinessBillNo> businessBillNos = new ArrayList<>();
 			BusinessBillNo businessBillNo = new BusinessBillNo();
 			businessBillNo.setTenantId(tenantIdCopy);
+			businessBillNo.setBranchId("1703929959275413506");
 			List<BusinessBillNo> businessBillNoList = losClient.getBusinessBillNo(businessBillNo);
 			for (BusinessBillNo item : businessBillNoList) {
 				item.setId(null);
@@ -273,6 +276,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 		LosAuditPathsActs losAuditPathsActs = new LosAuditPathsActs();
 		losAuditPathsActs.setTenantId(tenantIdCopy);
 		losAuditPathsActs.setPathId(oldParentId);
+		losAuditPathsActs.setSalesCompanyId(1703929959275413506L);
 		List<LosAuditPathsActs> losAuditPathsActsList = new ArrayList<>();
 		List<LosAuditPathsActs> list = losClient.getLosAuditPathsActs(losAuditPathsActs);
 		for (LosAuditPathsActs item : list) {