b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-08-24 21:19:53 +08:00
parent 172098bb59
commit 71114f73dc
7 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CommonCargo.java
+3
View File
@@ -22,6 +22,8 @@
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -76,6 +78,7 @@ public class CommonCargo extends TenantEntity {
private String packageType;
@Schema(description = "货值")
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private BigDecimal cargoValue;
@Schema(description = "规格")
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.java
+15
View File
@@ -41,6 +41,21 @@ import java.util.List;
*/
public interface DriverMapper extends BaseMapper<Driver> {
/**
* 按身份证号查询司机（包含逻辑删除记录，用于唯一性校验）。
*/
Driver selectByIdCardNoIncludingDeleted(@Param("idCardNo") String idCardNo);
/**
* 按主键查询司机（包含逻辑删除记录，用于提交前校验）。
*/
Driver selectByIdIncludingDeleted(@Param("id") Long id);
/**
* 恢复逻辑删除司机。
*/
int restoreById(@Param("id") Long id);
/**
* 自定义分页
*
blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
+22
View File
@@ -90,6 +90,28 @@
remark
</sql>
<select id="selectByIdCardNoIncludingDeleted" resultType="org.springblade.transport.pojo.entity.Driver">
SELECT
<include refid="BaseColumn"/>
FROM blade_transport_driver
WHERE id_card_no = #{idCardNo}
LIMIT 1
</select>
<select id="selectByIdIncludingDeleted" resultType="org.springblade.transport.pojo.entity.Driver">
SELECT
<include refid="BaseColumn"/>
FROM blade_transport_driver
WHERE id = #{id}
LIMIT 1
</select>
<update id="restoreById">
UPDATE blade_transport_driver
SET is_deleted = 0
WHERE id = #{id}
</update>
<sql id="ExpiryExpiredCondition">
(
((driving_license_long_term IS NULL OR driving_license_long_term != 1) AND driving_license_end_date &lt; #{driver.today})
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonCargoServiceImpl.java
+7
View File
@@ -43,6 +43,7 @@ import org.springblade.transport.wrapper.CommonCargoWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -115,6 +116,7 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
return list(queryWrapper).stream().map(record -> {
CommonCargoExportExcel excel = new CommonCargoExportExcel();
BeanUtil.copyProperties(record, excel);
excel.setCargoValue(normalizeCargoValue(record.getCargoValue()));
excel.setPackageBrand(String.join(" / ", List.of(
Func.isEmpty(record.getPackageType()) ? "" : record.getPackageType(),
Func.isEmpty(record.getBrand()) ? "" : record.getBrand()
@@ -255,6 +257,7 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
}
private void prepare(CommonCargo commonCargo) {
commonCargo.setCargoValue(normalizeCargoValue(commonCargo.getCargoValue()));
commonCargo.setFirstCargoTypeName(TransportBusinessSupport.trimToNull(commonCargo.getFirstCargoTypeName()));
commonCargo.setFirstCargoTypeCode(TransportBusinessSupport.trimToNull(commonCargo.getFirstCargoTypeCode()));
commonCargo.setSecondCargoTypeName(TransportBusinessSupport.trimToNull(commonCargo.getSecondCargoTypeName()));
@@ -280,6 +283,10 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
if (commonCargo.getStatus() == null) { commonCargo.setStatus(1); }
}
private BigDecimal normalizeCargoValue(BigDecimal cargoValue) {
return cargoValue != null && cargoValue.compareTo(BigDecimal.ONE.negate()) == 0 ? null : cargoValue;
}
private void validate(CommonCargo commonCargo) {
TransportBusinessSupport.validateRequired(commonCargo.getFirstCargoTypeName(), "请选择一级货物类型");
TransportBusinessSupport.validateRequired(commonCargo.getSecondCargoTypeCode(), "请选择二级货物类型");
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverServiceImpl.java
+26 -8
View File
@@ -27,7 +27,6 @@ package org.springblade.transport.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.utils.BeanUtil;
@@ -73,7 +72,7 @@ public class DriverServiceImpl extends BaseServiceImpl<DriverMapper, Driver> imp
public boolean submit(Driver driver) {
prepare(driver);
validate(driver);
checkUniqueIdCard(driver);
prepareSubmitTarget(driver);
return saveOrUpdate(driver);
}
@@ -235,14 +234,33 @@ public class DriverServiceImpl extends BaseServiceImpl<DriverMapper, Driver> imp
}
}
private void checkUniqueIdCard(Driver driver) {
Long count = count(Wrappers.<Driver>lambdaQuery()
.eq(Driver::getIsDeleted, 0)
.eq(Driver::getIdCardNo, driver.getIdCardNo())
.ne(Func.isNotEmpty(driver.getId()), Driver::getId, driver.getId()));
if (count > 0) {
private void prepareSubmitTarget(Driver driver) {
Driver existingById = Func.isEmpty(driver.getId())
? null : baseMapper.selectByIdIncludingDeleted(driver.getId());
if (Func.isNotEmpty(driver.getId()) && existingById == null) {
throw new ServiceException("司机不存在，不能提交");
}
Driver existingByIdCard = baseMapper.selectByIdCardNoIncludingDeleted(driver.getIdCardNo());
if (existingByIdCard == null) {
if (existingById != null && Objects.equals(existingById.getIsDeleted(), 1)) {
throw new ServiceException("司机不存在，不能提交");
}
return;
}
boolean sameRecord = existingById != null
&& Objects.equals(existingByIdCard.getId(), existingById.getId());
if (!Objects.equals(existingByIdCard.getIsDeleted(), 1)) {
if (!sameRecord) {
throw new ServiceException("身份证号已存在");
}
return;
}
if (!sameRecord && Func.isNotEmpty(driver.getId())) {
throw new ServiceException("身份证号已存在");
}
baseMapper.restoreById(existingByIdCard.getId());
driver.setId(existingByIdCard.getId());
driver.setIsDeleted(0);
}
private void validateLength(String value, int maxLength, String message) {
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java
+9 -4
View File
@@ -848,12 +848,14 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
Map<String, BigDecimal> feeItems = parseFeeItems(feeRow.getFeeItemsJson());
boolean containsFreight = feeItems.keySet().stream().anyMatch(this::isFreightFeeItem);
if (!containsFreight) {
aggregates.merge(summaryKey("物流配送", "运输费"), money(feeRow.getFreightAmount()),
aggregates.merge(
summaryKey(feeTypeMap.getOrDefault("运输费", ""), "运输费"),
money(feeRow.getFreightAmount()),
BigDecimal::add);
}
feeItems.forEach((feeItem, amount) -> aggregates.merge(
summaryKey(feeTypeMap.getOrDefault(feeItem,
isFreightFeeItem(feeItem) ? "物流配送" : "其他费用"), feeItem),
""), feeItem),
money(amount), BigDecimal::add));
}
summaryFeeMapper.delete(Wrappers.<PreSettlementSummaryFee>lambdaQuery()
@@ -884,6 +886,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
private void applySummaryRequest(Long settlementId, List<PreSettlementSaveRequest.SummaryFee> requestRows) {
if (requestRows == null) return;
Map<String, String> generatedFeeTypeMap = contractFeeTypeMap(loadExisting(settlementId).getContractId());
Map<String, Set<String>> allowedManualFees = new LinkedHashMap<>();
if (requestRows.stream().anyMatch(row -> Integer.valueOf(1).equals(row.getManualFlag()))) {
for (Map<String, Object> option : feeOptions()) {
@@ -935,12 +938,14 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
row.getFeeItem() + "金额" + row.getSettlementAmount(), "");
continue;
}
String feeItem = requiredText(requestRow.getFeeItem(), "费用项");
String feeType = generatedFeeTypeMap.getOrDefault(feeItem, "");
PreSettlementSummaryFee row = existingMap.get(requestRow.getId());
if (row == null) {
row = existingMap.values().stream()
.filter(item -> !Integer.valueOf(1).equals(item.getManualFlag()))
.filter(item -> Objects.equals(item.getFeeType(), requestRow.getFeeType())
&& Objects.equals(item.getFeeItem(), requestRow.getFeeItem()))
.filter(item -> Objects.equals(item.getFeeType(), feeType)
&& Objects.equals(item.getFeeItem(), feeItem))
.findFirst().orElse(null);
}
if (row == null || Integer.valueOf(1).equals(row.getManualFlag())) {
blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonCargoWrapper.java
+4
View File
@@ -30,6 +30,7 @@ import org.springblade.system.cache.UserCache;
import org.springblade.transport.pojo.entity.CommonCargo;
import org.springblade.transport.pojo.vo.CommonCargoVO;
import java.math.BigDecimal;
import java.util.Objects;
/**
@@ -46,6 +47,9 @@ public class CommonCargoWrapper extends BaseEntityWrapper<CommonCargo, CommonCar
@Override
public CommonCargoVO entityVO(CommonCargo commonCargo) {
CommonCargoVO commonCargoVO = Objects.requireNonNull(BeanUtil.copyProperties(commonCargo, CommonCargoVO.class));
if (commonCargoVO.getCargoValue() != null && commonCargoVO.getCargoValue().compareTo(BigDecimal.ONE.negate()) == 0) {
commonCargoVO.setCargoValue(null);
}
commonCargoVO.setCreateUserName(UserCache.getUserRealName(commonCargo.getCreateUser()));
commonCargoVO.setUpdateUserName(UserCache.getUserRealName(commonCargo.getUpdateUser()));
Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());