Merge branch 'dev_import' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java

@@ -38,7 +38,7 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo {
     private String principalPhone;
 
     @Excel(name = "创建时间", needMerge = true)
-    private Date organizationCreatedTime;
+    private String organizationCreatedTime;
 
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> persons;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -67,6 +67,8 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -433,7 +435,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                 e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                 e.setPid(agencyInfo.getPid());
                 e.setPids(agencyInfo.getPids());
-                e.setOrganizationCreatedTime(l.getOrganizationCreatedTime());
+               // e.setOrganizationCreatedTime(l.getOrganizationCreatedTime());
                 baseDao.insert(e);
                 if (CollectionUtils.isNotEmpty(l.getPersons())){
                     l.getPersons().forEach(p -> {
@@ -540,7 +542,12 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                     e.setPid(agencyInfo.getPid());
                     e.setPids(agencyInfo.getPids());
-                    e.setOrganizationCreatedTime(l.getOrganizationCreatedTime());
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    try {
+                        e.setOrganizationCreatedTime(sdf.parse(l.getOrganizationCreatedTime()));
+                    } catch (ParseException ex) {
+                        ex.printStackTrace();
+                    }
                     baseDao.insert(e);
                     if (CollectionUtils.isNotEmpty(l.getPersons())){
                         l.getPersons().forEach(p -> {
@@ -579,6 +586,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             String url = erroeImport(fileList);
             upImportTask(url, taskId, tokenDto.getUserId(), true);
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("【社会自组织信息导入】程序错误");
             upImportTask(null, taskId, tokenDto.getUserId(), false);
         }
@@ -643,7 +651,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
         } else {
             importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
-            importTaskForm.setResultDesc("社会自组织导入存在错误");
+            importTaskForm.setResultDesc("社会自组织导入存在程序错误");
         }
         Result result = commonServiceOpenFeignClient.finishImportTask(importTaskForm);
         if (!result.success()) {

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -433,7 +433,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
             importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
         } else {
             importTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
-            importTaskForm.setResultDesc("党员风采导入存在错误");
+            importTaskForm.setResultDesc("党员风采导入存在程序错误");
         }
         Result result = commonServiceOpenFeignClient.finishImportTask(importTaskForm);
         if (!result.success()) {