Merge branch 'develop' into release_temp

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SendNoticeFormDTO.java

@@ -42,7 +42,6 @@ public class SendNoticeFormDTO implements Serializable {
     /**
      * 组织名
      */
-    @NotNull(message = "组织名不能为空", groups = DefaultGroup.class)
     private String orgName;
 
     @NoArgsConstructor

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java

@@ -32,6 +32,7 @@ public class IcTripReportExcelImportListener implements ReadListener<IcTripRepor
      * 当前操作用户
      */
     private CustomerStaffInfoCacheResult staffInfo;
+    private String customerId;
 
     /**
      * 数据
@@ -45,7 +46,8 @@ public class IcTripReportExcelImportListener implements ReadListener<IcTripRepor
 
     private IcTripReportRecordServiceImpl tripReportRecordService;
 
-    public IcTripReportExcelImportListener(CustomerStaffInfoCacheResult staffInfo, IcTripReportRecordServiceImpl tripReportRecordService) {
+    public IcTripReportExcelImportListener(String customerId,CustomerStaffInfoCacheResult staffInfo, IcTripReportRecordServiceImpl tripReportRecordService) {
+        this.customerId=customerId;
         this.staffInfo = staffInfo;
         this.tripReportRecordService = tripReportRecordService;
     }
@@ -58,6 +60,7 @@ public class IcTripReportExcelImportListener implements ReadListener<IcTripRepor
             ValidatorUtils.validateEntity(data);
 
             IcTripReportRecordEntity tripReportRecordEntity = ConvertUtils.sourceToTarget(data, IcTripReportRecordEntity.class);
+            tripReportRecordEntity.setCustomerId(customerId);
             tripReportRecordEntity.setAgencyId(staffInfo.getAgencyId());
             tripReportRecordEntity.setPids(staffInfo.getAgencyPIds());
             tripReportRecordEntity.setUserType(IcResiUserConstant.USER_TYPE_IMPORT);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

@@ -437,7 +437,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             return new ArrayList<>();
         }
         //关注类型，核酸检测：2，疫苗接种：1,行程上报：0
-        return baseDao.getIdCardList(customerId,idCardSet,NumConstant.ZERO);
+        return baseDao.getIdCardList(customerId,idCardSet,NumConstant.TWO);
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -217,7 +217,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         //避免再发通知，赋值个空集合吧
         dto.setChannel(Collections.emptyList());
         //关注类型，核酸检测：2，疫苗接种：1;行程上报：0
-        dto.setAttentionType(NumConstant.ZERO);
+        dto.setAttentionType(NumConstant.TWO);
         list.add(dto);
         vaccinationAddFormDTO.setList(list);
         epidemicSpecialAttentionService.vaccinationAdd( vaccinationAddFormDTO);
@@ -343,7 +343,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             //获取当前登录用户所属组织id
             CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId);
 
-            IcTripReportExcelImportListener listener = new IcTripReportExcelImportListener(staffInfo, this);
+            IcTripReportExcelImportListener listener = new IcTripReportExcelImportListener(customerId,staffInfo, this);
 
             EasyExcel.read(filePath.toFile(), IcTripReportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();