From 7679b0475adbcc568bf7e504eef4f7780e2b6676 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 11 Mar 2026 11:15:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=BE=85?=
=?UTF-8?q?=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E6=9B=B4=E6=96=B0=E6=97=B6?=
=?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将查询条件从 update_time 修改为 complete_time 字段
- 确保开始时间和结束时间筛选使用正确的完成时间字段
---
.../com/klp/service/impl/WmsCoilPendingActionServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
index 32156662..23e200e2 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
@@ -108,8 +108,8 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
qw.orderByDesc("wcpa.create_time");
qw.orderByDesc("wcpa.scan_time");
//根据开始时间和结束时间筛选修改时间
- qw.ge(bo.getStartTime() != null, "wcpa.update_time", bo.getStartTime());
- qw.le(bo.getEndTime() != null, "wcpa.update_time", bo.getEndTime());
+ qw.ge(bo.getStartTime() != null, "wcpa.complete_time", bo.getStartTime());
+ qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime());
// 根据更新人查询
qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy());
//逻辑删除
From 18bffc43253df9a3e67041c62665c0f6c9400290 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 11 Mar 2026 11:15:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(employee):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=91=98=E5=B7=A5=E7=A4=BE=E4=BF=9D=E7=B1=BB=E5=9E=8B=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 WmsEmployeeInfo 实体类中新增 socialInsuranceType 字段
- 在 WmsEmployeeInfoBo 业务对象中新增 socialInsuranceType 字段
- 在 WmsEmployeeInfoVo 视图对象中新增 socialInsuranceType 字段
- 在 MyBatis 映射文件中添加社保类型字段映射配置
- 在查询条件构建器中添加社保类型筛选条件
---
klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java | 4 ++++
.../src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java | 5 +++++
.../src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java | 5 +++++
.../com/klp/service/impl/WmsEmployeeInfoServiceImpl.java | 1 +
.../src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml | 1 +
5 files changed, 16 insertions(+)
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
index c9ed0b12..67121aee 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -82,6 +82,10 @@ public class WmsEmployeeInfo extends BaseEntity {
* 紧急联系人电话
*/
private String emergencyContactPhone;
+ /**
+ * 社保类型（三险/五险）
+ */
+ private String socialInsuranceType;
/**
* 逻辑删除标识：0=正常，1=已删
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
index 5184504e..bb8f9d34 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
@@ -94,6 +94,11 @@ public class WmsEmployeeInfoBo extends BaseEntity {
*/
private String emergencyContactPhone;
+ /**
+ * 社保类型（三险/五险）
+ */
+ private String socialInsuranceType;
+
/**
* 备注
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
index 7fb0e226..b5e33d7f 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
@@ -112,6 +112,11 @@ public class WmsEmployeeInfoVo {
@ExcelProperty(value = "紧急联系人电话")
private String emergencyContactPhone;
+ /**
+ * 社保类型（三险/五险）
+ */
+ private String socialInsuranceType;
+
/**
* 备注
*/
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
index e4ce1b87..37f51e06 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
@@ -75,6 +75,7 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), WmsEmployeeInfo::getEmergencyContact, bo.getEmergencyContact());
lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship());
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
+ lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
return lqw;
}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
index 82f4c682..d1b8bb11 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
@@ -20,6 +20,7 @@
+