Merge remote-tracking branch 'origin/dev_resi_export' into develop

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -155,7 +156,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
         //1.遍历一级表单项
         for (IcExportItemListFormDTO dto : dataList) {
             IcExportTemplateConfigEntity itemEntity = ConvertUtils.sourceToTarget(dto, IcExportTemplateConfigEntity.class);
-            itemEntity.setId(UUID.randomUUID().toString().replace("-", ""));
+            itemEntity.setId(IdWorker.getIdStr());
             itemEntity.setPid(pid);
             itemEntity.setCustomerId(customerId);
             itemEntity.setTempId(tempId);

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

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/4/27 15:30
+ * @DESC
+ */
+@Data
+public class AttentionDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8257288519752831619L;
+
+    @NotBlank(message = "id不能为空",groups = VaccinationListFormDTO.VaccinationListForm.class)
+    private String id;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java

@@ -99,6 +99,7 @@ public class VaccinationListResultDTO implements Serializable {
      * 小区名+楼栋名+单元名+房屋名
      */
     private String allName;
+    private String id;
 
     public VaccinationListResultDTO() {
         this.vaccinationCount = NumConstant.ZERO;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java

@@ -17,6 +17,7 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.dto.result.VaccinationListResultDTO;
 import com.epmet.excel.NatExportExcel;
 import com.epmet.excel.NatImportExcel;
 import com.epmet.excel.VaccinationExportExcel;
@@ -67,6 +68,18 @@ public class IcEpidemicSpecialAttentionController {
         return new Result<PageData>().ok(icEpidemicSpecialAttentionService.vaccinationList(formDTO));
     }
 
+    /**
+     * Desc: 【疫苗接种关注名单，疫苗接种关注名单】详情
+     * @param formDTO
+     * @author zxc
+     * @date 2022/4/27 15:47
+     */
+    @PostMapping("detail")
+    public Result<VaccinationListResultDTO> detail(@RequestBody AttentionDetailFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class);
+        return new Result<VaccinationListResultDTO>().ok(icEpidemicSpecialAttentionService.detail(formDTO));
+    }
+
     /**
      * Desc:【疫苗接种关注名单，核酸检测关注名单】新增
      * @param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java

@@ -1,6 +1,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.AttentionDetailFormDTO;
 import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.dto.result.VaccinationListResultDTO;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
@@ -26,6 +27,14 @@ public interface IcEpidemicSpecialAttentionDao extends BaseDao<IcEpidemicSpecial
      */
     List<VaccinationListResultDTO> vaccinationList(VaccinationListFormDTO formDTO);
 
+    /**
+     * Desc: 关注详情
+     * @param formDTO
+     * @author zxc
+     * @date 2022/4/27 15:42
+     */
+    VaccinationListResultDTO nat(AttentionDetailFormDTO formDTO);
+
     /**
      * Desc: 核酸检测关注名单
      * @param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java

@@ -4,9 +4,11 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
+import com.epmet.dto.form.AttentionDetailFormDTO;
 import com.epmet.dto.form.CancelAttentionPackageFormDTO;
 import com.epmet.dto.form.VaccinationAddFormDTO;
 import com.epmet.dto.form.VaccinationListFormDTO;
+import com.epmet.dto.result.VaccinationListResultDTO;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 
 import java.io.InputStream;
@@ -130,4 +132,12 @@ public interface IcEpidemicSpecialAttentionService extends BaseService<IcEpidemi
      * @return
      */
     List<String> getHeSuanIdCardList(String customerId,List<String> idCardSet);
+
+    /**
+     * Desc: 详情
+     * @param formDTO
+     * @author zxc
+     * @date 2022/4/27 15:33
+     */
+    VaccinationListResultDTO detail(AttentionDetailFormDTO formDTO);
 }

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

@@ -467,6 +467,17 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         return baseDao.getIdCardList(customerId,idCardSet,NumConstant.TWO);
     }
 
+    /**
+     * Desc: 详情
+     * @param formDTO
+     * @author zxc
+     * @date 2022/4/27 15:33
+     */
+    @Override
+    public VaccinationListResultDTO detail(AttentionDetailFormDTO formDTO) {
+        return baseDao.nat(formDTO);
+    }
+
     /**
      * Desc: 文件上传并返回url
      * @param errorRows

epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml

@@ -20,7 +20,7 @@
 
     <!-- 疫苗接种关注名单 -->
     <select id="vaccinationList" resultType="com.epmet.dto.result.VaccinationListResultDTO">
-        SELECT
+        SELECT a.id,
             a.`NAME`,
             a.MOBILE,
             a.ID_CARD,
@@ -67,7 +67,7 @@
 
     <!-- 核酸检测关注名单 -->
     <select id="natList" resultType="com.epmet.dto.result.VaccinationListResultDTO">
-        SELECT
+        SELECT a.id,
         a.`NAME`,
         a.MOBILE,
         a.ID_CARD,
@@ -144,4 +144,16 @@
                 </foreach>
             )
     </select>
+
+    <!-- 关注详情 -->
+    <select id="nat" resultType="com.epmet.dto.result.VaccinationListResultDTO">
+        SELECT
+            a.`NAME`,
+            a.MOBILE,
+            a.ID_CARD,
+            a.REMARK,
+            a.REASON
+        FROM ic_epidemic_special_attention a
+        WHERE a.ID = #{id}
+    </select>
 </mapper>