解决出入管理缺陷

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

@@ -121,7 +121,10 @@ public class CoreOutInRecordVo{
     @JsonFormat(pattern = "yyyy年MM月dd日", timezone = "GMT+8")
     private Date endTime;
 
+
     private String letterNo;
 
+    private Integer effectiveDays;
+
 
 }

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

@@ -242,15 +242,17 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         introduceLetter.setOrgId(sysOrg.getId());
         introduceLetter.setOrgPath(sysOrg.getPath());
         introduceLetter.setOrgName(sysOrg.getName());
-        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));
-        }
+        introduceLetter.setStartTime(coreIntroduceLetter.getStartTime());
+        introduceLetter.setEndTime(DateUtil.offsetDay(coreIntroduceLetter.getStartTime(),coreIntroduceLetter.getEffectiveDays()-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

@@ -65,7 +65,7 @@
         <if test="(coreIntroduceLetter.type ==null  or coreIntroduceLetter.type =='') and !coreIntroduceLetter.getRequestFromWeb">
             and a.type in (2,3)
         </if>
-        <if test="coreIntroduceLetter.status != null  and coreIntroduceLetter.status != ''">
+        <if test="coreIntroduceLetter.status != null">
             and a.status = #{coreIntroduceLetter.status}
         </if>
         order by a.create_time DESC

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

@@ -82,7 +82,8 @@
             l.letter_file,
             l.letter_file as letterFileStr,
             l.start_time,
-            l.end_time
+            l.end_time,
+            l.effective_days
         FROM
             core_out_in_record r
                 INNER JOIN sys_org o ON r.org_id=o.id