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

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java

@@ -72,6 +72,11 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity {
 	 */
 	private String funType;
 
+	/**
+	 * 手机号：mobile; 身份证：id_card；只能输入数字:num
+	 */
+	private String validType;
+	
     /**
      * 排序
      */

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.24__add_validtype_forbuild.sql

@@ -0,0 +1,6 @@
+alter table ic_form_query_builder add COLUMN VALID_TYPE VARCHAR(32) COMMENT '手机号：mobile; 身份证：id_card；只能输入数字:num' after FUN_TYPE;
+
+update ic_form_query_builder set VALID_TYPE=(
+select i.VALID_TYPE from ic_form_item i where i.id=FORM_ITEM_ID
+and i.CUSTOMER_ID=CUSTOMER_ID
+)where DEL_FLAG='0';

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -77,7 +77,7 @@
             b.ITEM_TYPE,
             i.ITEM_GROUP_ID,
             i.REQUIRED,
-            IFNULL(i.VALID_TYPE,'')as VALID_TYPE,
+            IFNULL(b.VALID_TYPE,'')as VALID_TYPE,
             IFNULL(i.DEFAULT_VALUE,'') as DEFAULT_VALUE,
             IFNULL(i.OPTION_SOURCE_TYPE,'') as OPTION_SOURCE_TYPE,
             IFNULL(i.OPTION_SOURCE_VALUE,'') as OPTION_SOURCE_VALUE,

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java

@@ -5,9 +5,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadStyle;
 import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -24,11 +26,15 @@ public class IcTripReportRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public interface DetailViewGroup {
+    }
+
     /**
      * 主键ID
      */
+    @NotBlank(message = "id不能为空", groups = DetailViewGroup.class)
     @ExcelIgnore
-	private String id;
+    private String id;
 
     /**
      * 居民端用户所在网格id,数字社区居民所属网格id

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

@@ -52,4 +52,9 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
      * 工作人员所属组织id
      */
     private String agencyId;
+
+    /**
+     * 查看详情时此列有值
+     */
+    private String id;
 }

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

@@ -46,6 +46,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.ExportGroup;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcResiUserDTO;
@@ -416,7 +417,7 @@ public class IcResiUserController implements ResultDataResolver {
     public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
         //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
         //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
-        ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class,ExportGroup.class);
+        ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class, ExportGroup.class);
         //获取导出配置
         icResiUserExportService.exportIcResiUser(pageFormDTO,response);
 

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

@@ -82,6 +82,20 @@ public class IcTripReportRecordController implements ResultDataResolver {
         return new Result<PageData<IcTripReportRecordDTO>>().ok(page);
     }
 
+    /**
+     * 查看详情
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("detail")
+    public Result<IcTripReportRecordDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class);
+        PageTripReportFormDTO pageTripReportFormDTO=new PageTripReportFormDTO();
+        pageTripReportFormDTO.setCustomerId(tokenDto.getCustomerId());
+        pageTripReportFormDTO.setUserId(tokenDto.getUserId());
+        return new Result<IcTripReportRecordDTO>().ok(icTripReportRecordService.detail(pageTripReportFormDTO));
+    }
+
     /**
      * pc: 行程上报-新增
      * @param formDTO

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

@@ -31,6 +31,8 @@ public interface IcTripReportRecordService extends BaseService<IcTripReportRecor
      */
     PageData<IcTripReportRecordDTO> page(PageTripReportFormDTO formDTO);
 
+    IcTripReportRecordDTO detail(PageTripReportFormDTO formDTO);
+
     /**
      * 默认查询
      *

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

@@ -90,7 +90,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     /**
      * 身份证号列序号
      */
-    public static final Integer ID_CARD_COLUMN_NO = 9;
+    public static final Integer ID_CARD_COLUMN_NO = 8;
     /**
      * 姓名列序号
      */

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

@@ -426,4 +426,40 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
             baseDao.insert(e);
         });
     }
+
+    public IcTripReportRecordDTO detail(PageTripReportFormDTO formDTO) {
+        //1.获取工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = queryCurrentStaff(formDTO.getCustomerId(), formDTO.getUserId());
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+        //2.按条件查询业务数据
+        List<IcTripReportRecordDTO> list = baseDao.pageList(formDTO);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        //3.查询最近一次通知时间、核算检测关注名单
+        Map<String, Date> latestNotice = new HashMap<>();
+        List<String> gzIdCardList = new ArrayList<>();
+        List<String> idCardList = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList());
+        //如果不分页可能会有很多个身份证号
+        List<List<String>> partionList = ListUtils.partition(idCardList, NumConstant.ONE_HUNDRED);
+        partionList.forEach(l -> {
+            Map<String, Date> map = icNoticeService.getUserLatestNoticeTime(formDTO.getCustomerId(), l);
+            List<String> gzIdCards = epidemicSpecialAttentionService.getHeSuanIdCardList(formDTO.getCustomerId(), l);
+            latestNotice.putAll(map);
+            gzIdCardList.addAll(gzIdCards);
+        });
+        for (IcTripReportRecordDTO dto : list) {
+            //默认未加入
+            dto.setHeSuanCheck(false);
+            dto.setHeSuanCheckDesc("未加入");
+            if (CollectionUtils.isNotEmpty(gzIdCardList) && gzIdCardList.contains(dto.getIdCard())) {
+                dto.setHeSuanCheck(true);
+                dto.setHeSuanCheckDesc("已加入");
+            }
+            if (MapUtils.isNotEmpty(latestNotice) && latestNotice.containsKey(dto.getIdCard())) {
+                dto.setLatestNoticeTime(latestNotice.get(dto.getIdCard()));
+            }
+        }
+        return list.get(NumConstant.ZERO);
+    }
 }

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

@@ -56,6 +56,9 @@
             <if test='null != endDate and "" != endDate'>
                 AND ARRIVE_DATE <![CDATA[ <= ]]> #{endDate}
             </if>
+            <if test='null != id and "" != id'>
+                AND r.id=#{id}
+            </if>
         ORDER BY
             r.ARRIVE_DATE DESC
     </select>