Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffPageVO.java

@@ -196,7 +196,7 @@ public class StaffPageVO extends PageParam {
     /**
      * 紧急联系人关系
      */
-    private String jjlxrgx;
+    private Integer jjlxrgx;
 
     /**
      * 基本情况备注

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffVO.java

@@ -190,7 +190,7 @@ public class StaffVO {
     /**
      * 紧急联系人关系
      */
-    private String jjlxrgx;
+    private Integer jjlxrgx;
 
     /**
      * 基本情况备注

zjugis-business/src/main/java/com/zjugis/business/flow/staff/entity/StaffDO.java

@@ -195,7 +195,7 @@ public class StaffDO extends BaseEntity {
     /**
      * 紧急联系人关系
      */
-    private String jjlxrgx;
+    private Integer jjlxrgx;
 
     /**
      * 基本情况备注

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsBaseVO.java

@@ -30,7 +30,6 @@ public class RecordsBaseVO {
     private String byxx;
 
     @Schema(description = "毕业时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime bysj;
 
     @Schema(description = "最高学历")
@@ -40,15 +39,12 @@ public class RecordsBaseVO {
     private String major;
 
     @Schema(description = "参加工作时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime cjgzsj;
 
     @Schema(description = "入公司时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime rgssj;
 
     @Schema(description = "离职时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime lzsj;
 
 
@@ -65,7 +61,6 @@ public class RecordsBaseVO {
     private String nation;
 
     @Schema(description = "出生日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime birthday;
 
     @Schema(description = "身份证号码")
@@ -114,7 +109,7 @@ public class RecordsBaseVO {
     private String jjlxrxm;
 
     @Schema(description = "紧急联系人关系")
-    private String jjlxrgx;
+    private Integer jjlxrgx;
 
     @Schema(description = "基本情况备注")
     private String jbqkbz;
@@ -130,11 +125,9 @@ public class RecordsBaseVO {
 
 
     @Schema(description = "转正时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime zzsj;
 
     @Schema(description = "合同到期时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime htdqs;
 
     @Schema(description = "签订公司ID")

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsPageReqVO.java

@@ -20,6 +20,9 @@ public class RecordsPageReqVO extends PageParam {
     @Schema(description = "员工姓名")
     private String nickname;
 
+    @Schema(description = "员工工号")
+    private String loginName;
+
     @Schema(description = "部门ID")
     private String deptId;
 

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/StaffRecordSDO.java

@@ -177,7 +177,7 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 紧急联系人关系
      */
-    private String jjlxrgx;
+    private Integer jjlxrgx;
 
     /**
      * 基本情况备注

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zjugis.module.adm.service.staff;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.web.core.util.WebFrameworkUtils;
@@ -10,12 +10,16 @@ import com.zjugis.module.adm.controller.admin.staff.vo.records.RecordsRespVO;
 import com.zjugis.module.adm.convert.staff.RecordsConvert;
 import com.zjugis.module.adm.dal.dataobject.staff.StaffRecordSDO;
 import com.zjugis.module.adm.dal.mysql.staff.RecordsMapper;
+import com.zjugis.module.system.api.dept.DeptApi;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author 陈俊
@@ -28,10 +32,19 @@ public class RecordsServiceImpl implements RecordsService {
     @Resource
     private RecordsMapper recordsMapper;
 
+//    @Resource
+//    DeptApi deptApi;
+
     @Override
     public Page<StaffRecordSDO> getRecordsPage(RecordsPageReqVO reqVO) {
-        Page<StaffRecordSDO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
-        return recordsMapper.getRecordsPage(page, reqVO);
+        Page<StaffRecordSDO> page = recordsMapper.getRecordsPage(new Page<>(reqVO.getPageNo(), reqVO.getPageSize()), reqVO);
+//        //查询部门
+//        List<StaffRecordSDO> dtoList = page.getRecords();
+//        if (CollectionUtil.isNotEmpty(dtoList)) {
+//            List<String> userIds = dtoList.stream().filter(v -> v.getUserId() != null).map(StaffRecordSDO::getUserId).collect(Collectors.toList());
+//
+//        }
+        return page;
     }
 
     @Override

zjugis-module-adm/zjugis-module-adm-biz/src/main/resources/mapper/staff/RecordsMapper.xml

@@ -12,6 +12,9 @@
                 <bind name="nickname" value="'%'+params.nickname+'%'"/>
                 AND t1.NICKNAME LIKE #{nickname}
             </if>
+            <if test="params != null and params.loginName != null and params.loginName != ''">
+                AND t1.LOGIN_NAME = #{params.loginName}
+            </if>
             <if test="params != null and params.state != null and params.state != ''">
                 AND t1.STATE = #{params.state}
             </if>