DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(is): 将委托单位 ID 字段类型从 Long 改为 String

Browse Source 
- 修改了 IsInspectionCommission 及其相关类中的 clientId 字段类型
- 更新了对应的 Mapper 和 XML 文件
-调整了查询条件和结果映射
This commit is contained in:
Joshi
2025-08-15 13:23:15 +08:00
parent 03ddbf949d
commit 6deb6cb113
11 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionCommission.java
View File

@@ -33,7 +33,7 @@ public class IsInspectionCommission extends BaseEntity {
/**
* 委托单位ID（外键关联客户表）
*/
private Long clientId;
private String client;
/**
* 样品名称
*/

3
klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java
View File

@@ -2,6 +2,7 @@ package com.klp.mes.is.domain.bo;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.klp.common.core.domain.BaseEntity;
import liquibase.pro.packaged.S;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
@@ -33,7 +34,7 @@ public class IsInspectionCommissionBo extends BaseEntity {
/**
* 委托单位ID（外键关联客户表）
*/
private Long clientId;
private String client;
/**
* 样品名称

2
klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java
View File

@@ -40,7 +40,7 @@ public class IsInspectionCommissionVo {
*/
@ExcelProperty(value = "委托单位ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "外=键关联客户表")
private Long clientId;
private String client;
/**
* 样品名称

7
klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java
View File

@@ -93,5 +93,12 @@ public class IsInspectionTaskVo {
@ExcelProperty(value = "备注")
private String remark;
//commission_no
/**
* 关联委托单号
*/
@ExcelProperty(value = "关联委托单号")
private String commissionNo;
}

4
klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java
View File

@@ -89,4 +89,8 @@ public class IsSampleInventoryVo {
private String remark;
@ExcelProperty(value = "关联委托单号")
private String commissionNo;
}

3
klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionTaskMapper.java
View File

@@ -5,6 +5,7 @@ import com.klp.mes.is.domain.IsInspectionTask;
import com.klp.mes.is.domain.bo.IsInspectionTaskBo;
import com.klp.mes.is.domain.vo.IsInspectionTaskVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 检验任务表Mapper接口
@@ -14,5 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
*/
public interface IsInspectionTaskMapper extends BaseMapperPlus<IsInspectionTaskMapper, IsInspectionTask, IsInspectionTaskVo> {
Page<IsInspectionTaskVo> selectVoPagePlus(Page<Object> build, IsInspectionTaskBo bo);
Page<IsInspectionTaskVo> selectVoPagePlus(@Param("page") Page<Object> build, @Param("bo") IsInspectionTaskBo bo);
}

3
klp-mes/src/main/java/com/klp/mes/is/mapper/IsSampleInventoryMapper.java
View File

@@ -5,6 +5,7 @@ import com.klp.mes.is.domain.IsSampleInventory;
import com.klp.mes.is.domain.bo.IsSampleInventoryBo;
import com.klp.mes.is.domain.vo.IsSampleInventoryVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* 样品库存表Mapper接口
@@ -14,5 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
*/
public interface IsSampleInventoryMapper extends BaseMapperPlus<IsSampleInventoryMapper, IsSampleInventory, IsSampleInventoryVo> {
Page<IsSampleInventoryVo> selectVoPagePlus(Page<Object> build, IsSampleInventoryBo bo);
Page<IsSampleInventoryVo> selectVoPagePlus(Page<Object> build,@Param("bo") IsSampleInventoryBo bo);
}

2
klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionCommissionServiceImpl.java
View File

@@ -62,7 +62,7 @@ public class IsInspectionCommissionServiceImpl implements IIsInspectionCommissio
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<IsInspectionCommission> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getCommissionNo()), IsInspectionCommission::getCommissionNo, bo.getCommissionNo());
lqw.eq(bo.getClientId() != null, IsInspectionCommission::getClientId, bo.getClientId());
lqw.eq(StringUtils.isNotBlank(bo.getClient()) , IsInspectionCommission::getClient, bo.getClient());
lqw.like(StringUtils.isNotBlank(bo.getSampleName()), IsInspectionCommission::getSampleName, bo.getSampleName());
lqw.eq(StringUtils.isNotBlank(bo.getSampleType()), IsInspectionCommission::getSampleType, bo.getSampleType());
lqw.eq(bo.getQuantity() != null, IsInspectionCommission::getQuantity, bo.getQuantity());