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

@@ -82,6 +82,10 @@ public class WmsEmployeeInfo extends BaseEntity {
      * 紧急联系人电话
      */
     private String emergencyContactPhone;
+    /**
+     * 社保类型（三险/五险）
+     */
+    private String socialInsuranceType;
     /**
      * 逻辑删除标识：0=正常，1=已删
      */

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;
+
     /**
      * 备注
      */

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;
+
     /**
      * 备注
      */

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.ge(bo.getStartTime() != null, "wcpa.complete_time", bo.getStartTime());
-        qw.le(bo.getEndTime() != null, "wcpa.update_time", bo.getEndTime());
+        qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime());
         // 根据更新人查询
         qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy());
         //逻辑删除

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;
     }
 

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

@@ -20,6 +20,7 @@
         <result property="emergencyContact" column="emergency_contact"/>
         <result property="relationship" column="relationship"/>
         <result property="emergencyContactPhone" column="emergency_contact_phone"/>
+        <result property="socialInsuranceType" column="social_insurance_type"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>