党员导入

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
 
 /**
  * 核酸检测信息导入excel数据
@@ -34,7 +33,7 @@ public class IcPartyMemberImportExcel {
     private String idCard;
 
     @ExcelProperty("地址")
-    private Date address;
+    private String address;
 
     @ExcelProperty("入党时间")
     private String rdsj;

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/handler/IcPartyMemberImportListener.java

@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 核酸检测excel导入监听器
+ * 党员excel导入监听器
  * @author Administrator
  */
 @Data
@@ -89,7 +89,7 @@ public class IcPartyMemberImportListener implements ReadListener<IcPartyMemberIm
                 errorMsg = ((ValidateException) e).getMsg();
             } else {
                 errorMsg = "未知错误";
-                log.error("【核酸检测信息导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
+                log.error("【党员信息导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
             }
 
             IcPartyMemberImportExcel.RowRemarkMessage errorRow = new IcPartyMemberImportExcel.RowRemarkMessage();

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

@@ -140,7 +140,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             //构造数据
             list.forEach(item -> {
                 item.setIsLd(NumConstant.ONE_STR.equals(item.getIsLd()) ? "是" : "否");
-                item.setIsLd(NumConstant.ONE_STR.equals(item.getIsPay()) ? "是" : "否");
+                item.setIsPay(NumConstant.ONE_STR.equals(item.getIsPay()) ? "是" : "否");
                 item.setPartyZw(PartyPostEnum.getName(item.getPartyZw()));
                 item.setCulture(education.getData().get(item.getCulture()));
                 item.setPoint(("0.00").equals(item.getPoint()) ? StrConstant.HYPHEN : item.getPoint());
@@ -457,7 +457,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             String app = EpmetRequestHolder.getHeader(AppClientConstant.APP);
             String client = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT);
 
-            log.info("【核酸检测导入】userId:{}, app:{}, client:{}", userId, app, client);
+            log.info("【党员信息导入】userId:{}, app:{}, client:{}", userId, app, client);
 
 
             IcPartyMemberImportListener listener = new IcPartyMemberImportListener(userId, this);
@@ -500,7 +500,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
                     try {
                         fileItem.delete();
                     } catch (Exception e){
-                        log.error("【核酸检测导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
+                        log.error("【党员信息导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
                     }
                 }
             }
@@ -512,16 +512,16 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
                     "");
 
             if (!result.success()) {
-                log.error("【核酸检测导入】导入记录状态修改为'finished_success'失败");
+                log.error("【党员信息导入】导入记录状态修改为'finished_success'失败");
             }
         } catch (Exception e) {
             String errorMsg = ExceptionUtils.getErrorStackTrace(e);
-            log.error("【核酸检测导入】出错:{}", errorMsg);
+            log.error("【党员信息导入】出错:{}", errorMsg);
 
             Result result = ImportTaskUtils.finishImportTask(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "导入失败");
 
             if (!result.success()) {
-                log.error("【核酸检测导入】导入记录状态修改为'finished_fail'失败");
+                log.error("【党员信息导入】导入记录状态修改为'finished_fail'失败");
             }
         } finally {
             // 删除临时文件
@@ -608,7 +608,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             otherRows.add(errorRow);
             return;
         }
-
+        e.setCustomerId(customerId);
         e.setAgencyId(org.getAgencyId());
         e.setAgencyPids(org.getAgencyPids());
         e.setSszb(org.getId());
@@ -635,7 +635,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             e.setIcResiUser(result.getData().getIcResiUser());
             e.setVolunteerCategory(result.getData().getVolunteerCategory());
         }
-
+        e.setCreatedBy(currentUserId);
+        e.setUpdatedBy(currentUserId);
         baseDao.insert(e);
     }