Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java

@@ -99,6 +99,9 @@ public class WmsEmployeeInfo extends BaseEntity {
     // 是否离职
     private Integer isLeave;
 
+    // 离职时间
+    private Date leaveTime;
+
     // 是否转正：0=未转正，1=已转正
     private Integer isRegular;
 

klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 import java.util.Date;
+import java.util.List;
 import com.klp.common.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -45,6 +46,11 @@ public class WmsCoilPendingActionBo extends BaseEntity {
     @NotNull(message = "操作类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer actionType;
 
+    /**
+     * 操作类型集合（用于多选筛选）
+     */
+    private List<Integer> actionTypes;
+
     /**
      * 操作状态（0=待处理，1=处理中，2=已完成，3=已取消）
      */

klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java

@@ -123,6 +123,19 @@ public class WmsEmployeeInfoBo extends BaseEntity {
     // 是否离职
     private Integer isLeave;
 
+    // 离职时间
+    private Date leaveTime;
+
+    // 离职时间开始
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date leaveStartTime;
+
+    // 离职时间结束
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date leaveEndTime;
+
     // 是否转正：0=未转正，1=已转正
     private Integer isRegular;
 

klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java

@@ -127,6 +127,10 @@ public class WmsEmployeeInfoVo {
     // 是否离职
     private Integer isLeave;
 
+    // 离职时间
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date leaveTime;
+
     // 是否转正：0=未转正，1=已转正
     private Integer isRegular;
 

klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java

@@ -96,7 +96,11 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         QueryWrapper<WmsCoilPendingAction> qw = Wrappers.query();
         qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId());
         qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo());
-        qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
+        if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) {
+            qw.in("wcpa.action_type", bo.getActionTypes());
+        } else {
+            qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
+        }
         if (bo.getActionStatus() != null) {
             if (bo.getActionStatus() == -1) {
                 qw.ne("wcpa.action_status", 2);
@@ -147,7 +151,11 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
         LambdaQueryWrapper<WmsCoilPendingAction> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getCoilId() != null, WmsCoilPendingAction::getCoilId, bo.getCoilId());
         lqw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), WmsCoilPendingAction::getCurrentCoilNo, bo.getCurrentCoilNo());
-        lqw.eq(bo.getActionType() != null, WmsCoilPendingAction::getActionType, bo.getActionType());
+        if (bo.getActionTypes() != null && !bo.getActionTypes().isEmpty()) {
+            lqw.in(WmsCoilPendingAction::getActionType, bo.getActionTypes());
+        } else {
+            lqw.eq(bo.getActionType() != null, WmsCoilPendingAction::getActionType, bo.getActionType());
+        }
         lqw.eq(bo.getActionStatus() != null, WmsCoilPendingAction::getActionStatus, bo.getActionStatus());
         lqw.eq(bo.getWarehouseId() != null, WmsCoilPendingAction::getWarehouseId, bo.getWarehouseId());
         lqw.eq(bo.getPriority() != null, WmsCoilPendingAction::getPriority, bo.getPriority());

klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java

@@ -80,6 +80,9 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
         // 是否离职
         lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
+        // 离职时间范围查询
+        lqw.ge(bo.getLeaveStartTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveStartTime());
+        lqw.le(bo.getLeaveEndTime() != null, WmsEmployeeInfo::getLeaveTime, bo.getLeaveEndTime());
         // 是否转正
         lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
 

klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml

@@ -28,6 +28,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
         <result property="isLeave" column="is_leave"/>
+        <result property="leaveTime" column="leave_time"/>
         <result property="isRegular" column="is_regular"/>
         <result property="regularTime" column="regular_time"/>
     </resultMap>