From fa259a29cd4c3494f30591f6dd970b88b7b8d8d1 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 17 Jul 2020 13:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/ArchivesDTO.java  |  9 ++++-
 .../archives/entity/ArchivesEntity.java       |  5 +--
 .../service/impl/ArchivesServiceImpl.java     | 33 +++++++++----------
 .../resources/mapper/archives/ArchivesDao.xml |  2 +-
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDTO.java
index e198a783..d9c0129d 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ArchivesDTO.java
@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -57,7 +58,7 @@ public class ArchivesDTO implements Serializable {
     /**
      * 归档日期
      */
-	private Date archiveTime;
+	private String archiveTime;
 
     /**
      * 页数
@@ -134,4 +135,10 @@ public class ArchivesDTO implements Serializable {
      */
 	private Date updatedTime;
 
+
+    /**
+     * 回显部门
+     */
+    private List<String> allDeptIdsShow;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/entity/ArchivesEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/entity/ArchivesEntity.java
index 8155eff1..40d206d5 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/entity/ArchivesEntity.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/entity/ArchivesEntity.java
@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.modules.archives.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 档案管理表 档案管理表
  *
@@ -56,7 +53,7 @@ public class ArchivesEntity extends BaseEpdcEntity {
     /**
      * 归档日期
      */
-	private Date archiveTime;
+	private String archiveTime;
 
     /**
      * 页数
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java
index dedfed74..5c17a5c5 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java
@@ -51,8 +51,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -101,7 +99,11 @@ public class ArchivesServiceImpl extends BaseServiceImpl<ArchivesDao, ArchivesEn
     @Override
     public ArchivesDTO get(String id) {
         ArchivesEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, ArchivesDTO.class);
+        ArchivesDTO archivesDTO =  ConvertUtils.sourceToTarget(entity, ArchivesDTO.class);
+        if(archivesDTO.getAllDeptIds().indexOf(",")!=-1){
+            archivesDTO.setAllDeptIdsShow(Arrays.asList(entity.getAllDeptIds().split(",")));
+        }
+        return archivesDTO;
     }
 
     @Override
@@ -119,6 +121,10 @@ public class ArchivesServiceImpl extends BaseServiceImpl<ArchivesDao, ArchivesEn
         if(baseDao.getArchivesDTOByArchivesNum("",dto.getArchivesNum())){
             throw new RenException("档号不能重复");
         }
+        //判断日期
+        if(dto.getArchiveTime().length()!=4 && dto.getArchiveTime().length()!=6 && dto.getArchiveTime().length()!=8) {
+            throw new RenException("日期格式错误");
+        }
         ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData();
         dto.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
         dto.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
@@ -144,6 +150,10 @@ public class ArchivesServiceImpl extends BaseServiceImpl<ArchivesDao, ArchivesEn
         if(baseDao.getArchivesDTOByArchivesNum(dto.getId(),dto.getArchivesNum())){
             throw new RenException("档号不能重复");
         }
+        //判断日期
+        if(dto.getArchiveTime().length()!=4 && dto.getArchiveTime().length()!=6 && dto.getArchiveTime().length()!=8) {
+            throw new RenException("日期格式错误");
+        }
         ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData();
         dto.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
         dto.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
@@ -163,6 +173,7 @@ public class ArchivesServiceImpl extends BaseServiceImpl<ArchivesDao, ArchivesEn
 
     @Override
     public PageData<ArchivesDTO> listPage(Map<String, Object> params) {
+        //处理param
         IPage<ArchivesDTO> page = getPage(params);
         List<ArchivesDTO> list = baseDao.getArchivesPageFromPc(params);
         return new PageData<>(list, page.getTotal());
@@ -250,20 +261,8 @@ public class ArchivesServiceImpl extends BaseServiceImpl<ArchivesDao, ArchivesEn
         for(ArchivesExcel archivesExcel : partyList){
 
             ArchivesEntity archivesEntity = ConvertUtils.sourceToTarget(archivesExcel, ArchivesEntity.class);
-            try {
-                if(archivesExcel.getArchiveTime().length()==4) {
-                    archivesEntity.setArchiveTime(new SimpleDateFormat("yyyy").parse(archivesExcel.getArchiveTime()));
-                }else if(archivesExcel.getArchiveTime().length()==6){
-                    String date =  archivesExcel.getArchiveTime();
-                    date = date.substring(0,4) + "-" + date.substring(4);
-                    archivesEntity.setArchiveTime(new SimpleDateFormat("yyyy-MM").parse(date));
-                }else if(archivesExcel.getArchiveTime().length()==8){
-                    String date =  archivesExcel.getArchiveTime();
-                    date = date.substring(0,4) + "-" + date.substring(4,6) + "-" + date.substring(6);
-                    archivesEntity.setArchiveTime(new SimpleDateFormat("yyyy-MM-dd").parse(date));
-                }
-            } catch (ParseException e) {
-                throw new RenException("日期转换错误");
+            if(archivesExcel.getArchiveTime().length()!=4 && archivesExcel.getArchiveTime().length()!=6 && archivesExcel.getArchiveTime().length()!=8) {
+                throw new RenException("日期格式错误");
             }
             archivesEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
             archivesEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
index 90222b10..87e3c33c 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml
@@ -51,7 +51,7 @@
         WHERE
         ea.DEL_FLAG = '0'
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND DATE_FORMAT( ea.ARCHIVE_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            AND ea.ARCHIVE_TIME BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId},ea.ALL_DEPT_IDS)