出入管理根据现场反馈调整界面

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/domain/CoreIntroduceLetter.java

@@ -61,6 +61,11 @@ public class CoreIntroduceLetter extends BaseEntity {
     @ApiModelProperty(value = "有效开始时间")
     private Date startTime;
 
+
+    @ApiModelProperty(value = "有效天数")
+    private Integer effectiveDays;
+
+
     /**
      * 有效结束时间
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/domain/CoreIntroduceLetterUser.java

@@ -41,7 +41,11 @@ private static final long serialVersionUID=1L;
 
     private String imgFile;
 
-    /** 介绍信文件 */
+    /** 证件类型 */
+    private Integer idType;
+
+
+    /** 介绍信证件号 */
     private String idCard;
 
     /** 创建机构 */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/dto/CoreIntroduceLetterAddDto.java

@@ -56,6 +56,9 @@ public class CoreIntroduceLetterAddDto{
     @ApiModelProperty(value = "有效结束时间")
     private Date endTime;
 
+    @ApiModelProperty(value = "有效天数")
+    private Integer effectiveDays;
+
     /**
      * 介绍信图片
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/dto/CoreIntroduceLetterUserAddDto.java

@@ -43,6 +43,9 @@ public class CoreIntroduceLetterUserAddDto {
 
     private String imgFile;
 
+    /** 证件类型 */
+    private Integer idType;
+
     /**
      * 介绍信文件
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterApproveVo.java

@@ -55,6 +55,8 @@ public class CoreIntroduceLetterApproveVo {
     @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     private Date startTime;
 
+    @ApiModelProperty(value = "有效天数")
+    private Integer effectiveDays;
     /**
      * 有效结束时间
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterInfoVo.java

@@ -49,6 +49,9 @@ public class CoreIntroduceLetterInfoVo {
      */
     @ApiModelProperty(value = "有效开始时间")
     private Date startTime;
+
+    @ApiModelProperty(value = "有效天数")
+    private Integer effectiveDays;
     @ApiModelProperty(value = "有效开始时间")
     @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     private Date startTimeStr;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterVo.java

@@ -49,6 +49,9 @@ public class CoreIntroduceLetterVo {
     @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     private Date startTime;
 
+    @ApiModelProperty(value = "有效天数")
+    private Integer effectiveDays;
+
     /**
      * 有效结束时间
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreOutInRecordVo.java

@@ -42,6 +42,9 @@ public class CoreOutInRecordVo{
     @ApiModelProperty(value = "单位")
     private String companyName;
 
+    @ApiModelProperty(value = "证件类型")
+    private Integer idType;
+
     /**
      * 证件号
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -1,5 +1,7 @@
 package com.xunmei.core.letter.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
@@ -27,6 +29,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -238,9 +242,15 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         introduceLetter.setOrgId(sysOrg.getId());
         introduceLetter.setOrgPath(sysOrg.getPath());
         introduceLetter.setOrgName(sysOrg.getName());
-        introduceLetter.setStartTime(coreIntroduceLetter.getRange().get(0));
-        introduceLetter.setEndTime(coreIntroduceLetter.getRange().get(1));
-
+        if(ObjectUtil.isNotEmpty(coreIntroduceLetter.getRange())) {
+            introduceLetter.setStartTime(coreIntroduceLetter.getRange().get(0));
+            introduceLetter.setEndTime(coreIntroduceLetter.getRange().get(1));
+            introduceLetter.setEffectiveDays((int) ChronoUnit.DAYS.between(LocalDate.parse(coreIntroduceLetter.getRange().get(0).toString()),LocalDate.parse(coreIntroduceLetter.getRange().get(1).toString())));
+        }
+        else {
+            introduceLetter.setStartTime(coreIntroduceLetter.getStartTime());
+            introduceLetter.setEndTime(DateUtil.offsetDay(coreIntroduceLetter.getStartTime(),coreIntroduceLetter.getEffectiveDays()-1));
+        }
         //封装人员信息
         List<CoreIntroduceLetterUserAddDto> userAddVoList =coreIntroduceLetter.getUserInfos();
         List<CoreIntroduceLetterUser> userList = new ArrayList<>();

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -140,9 +140,9 @@
         </trim>
     </insert>
     <insert id="saveUserList">
-        insert into core_introduce_letter_user (id,user_name,company_name,id_card,img_file,letter_id,create_by,create_time)values
+        insert into core_introduce_letter_user (id,user_name,company_name,id_type,id_card,img_file,letter_id,create_by,create_time)values
         <foreach collection="userList" item="item" index="index"  separator="," >
-            (#{item.id},#{item.userName},#{item.companyName},#{item.idCard},#{item.imgFile},#{item.letterId},#{item.createBy},#{item.createTime})
+            (#{item.id},#{item.userName},#{item.companyName},#{item.idType},#{item.idCard},#{item.imgFile},#{item.letterId},#{item.createBy},#{item.createTime})
         </foreach>
     </insert>
     <insert id="saveToOrgList">
@@ -291,7 +291,7 @@
         <if test="coreIntroduceLetter.approveStatus !=null">
             and c.approve_status = #{coreIntroduceLetter.approveStatus}
         </if>
-        order by c.approve_status
+        order by c.approve_status ASC,a.create_time DESC
     </select>
     <select id="findLetterApproveInfos"
             resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterApproveVo">

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreOutInRecordMapper.xml

@@ -15,6 +15,7 @@
             o.short_name as orgName,
             u.user_name,
             u.company_name,
+            u.id_type,
             u.id_card,
             u.img_file,
             l.reasons,
@@ -72,6 +73,7 @@
             o.short_name as orgName,
             u.user_name,
             u.company_name,
+            u.id_type,
             u.id_card,
             u.img_file,
             l.reasons,