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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java

@@ -33,7 +33,7 @@ public class PageFormDTO implements Serializable {
      */
     private Integer offset;
 
-    private Boolean isPage;
+    private Boolean isPage = true;
 
     public Integer getOffset() {
         return (pageNo-1)*pageSize;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolRecordFormDTO.java

@@ -122,6 +122,9 @@ public class AddPlacePatrolRecordFormDTO implements Serializable {
     //token中userId
     private String staffId;
 
-    public interface Add {}
+    @NotBlank(message = "placePatrolRecordId不能为空", groups = {Update.class})
+    private String placePatrolRecordId;
 
+    public interface Add {}
+    public interface Update {}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java

@@ -60,6 +60,19 @@ public class IcPlacePatrolRecordController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 新增场所巡查记录
+     **/
+    @PostMapping("update")
+    public Result update(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolRecordFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddPlacePatrolRecordFormDTO.Add.class,AddPlacePatrolRecordFormDTO.Update.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        placePatrolRecordService.update(formDTO);
+        return new Result();
+    }
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java

@@ -38,6 +38,8 @@ public interface IcPlacePatrolRecordService extends BaseService<IcPlacePatrolRec
      **/
     void add(AddPlacePatrolRecordFormDTO formDTO);
 
+    void update(AddPlacePatrolRecordFormDTO formDTO);
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -28,24 +27,17 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPlacePatrolRecordDao;
 import com.epmet.dao.IcPlacePatrolTeamStaffDao;
-import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
 import com.epmet.dto.form.AddPlacePatrolRecordFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO;
-import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
-import com.epmet.dto.result.*;
-import com.epmet.entity.IcHouseEntity;
+import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO;
+import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO;
 import com.epmet.entity.IcPlacePatrolRecordEntity;
-import com.epmet.entity.IcPlacePatrolTeamEntity;
-import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcPlacePatrolRecordService;
 import com.epmet.service.IcPlacePatrolReviewRecordService;
-import com.epmet.service.IcPlacePatrolTeamService;
-import com.epmet.service.IcPlacePatrolTeamStaffService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +82,23 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
         insert(entity);
     }
 
+    /**
+     * @Author sun
+     * @Description 修改场所巡查记录
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AddPlacePatrolRecordFormDTO formDTO) {
+        IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolRecordEntity.class);
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        entity.setAgencyId(staffInfoCache.getAgencyId());
+        entity.setPids(staffInfoCache.getAgencyPIds());
+        entity.setFinalResult(entity.getFirstResult());
+        entity.setFinalTime(entity.getFirstTime());
+        entity.setId(formDTO.getPlacePatrolRecordId());
+        updateById(entity);
+    }
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

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

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+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 lombok.Data;
+
+/**
+ * @Description 核酸检测-我的上报记录
+ * @Author sun
+ */
+@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
+@Data
+public class NatListCommonExcelResultDTO extends NatListResultDTO{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 是否客户下居民(0:否  1:是)
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "本辖区居民",order = 6)
+    private String isResiUser;
+
+
+
+}

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

@@ -35,10 +35,7 @@ public class NatListResultDTO implements Serializable {
      */
     @ExcelIgnore
     private String userId;
-    /**
-     * 是否客户下居民(0:否  1:是)
-     */
-    private String isResiUser;
+
     /**
      * 居民端小程序的人：resi;数字社区的居民：icresi;未关联上的：other
      */
@@ -49,21 +46,21 @@ public class NatListResultDTO implements Serializable {
      * 姓名
      */
     @ColumnWidth(20)
-    @ExcelProperty("姓名")
+    @ExcelProperty(value = "姓名",order = 1)
     private String name;
 
     /**
      * 手机号
      */
     @ColumnWidth(20)
-    @ExcelProperty("手机号")
+    @ExcelProperty(value = "手机号",order = 2)
     private String mobile;
 
     /**
      * 身份证号
      */
     @ColumnWidth(25)
-    @ExcelProperty("身份证号")
+    @ExcelProperty(value = "身份证号",order = 3)
     private String idCard;
 
     /**
@@ -71,21 +68,27 @@ public class NatListResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ColumnWidth(25)
-    @ExcelProperty("检测时间")
+    @ExcelProperty(value = "检测时间",order = 4)
     private Date natTime;
 
     /**
      * 检测结果
      */
     @ColumnWidth(20)
-    @ExcelProperty("检测结果")
+    @ExcelProperty(value = "检测结果",order = 5)
     private String natResult;
 
+    /**
+     * 是否客户下居民(0:否  1:是)
+     */
+    @ExcelIgnore
+    private String isResiUser;
+
     /**
      * 检测地点
      */
     @ColumnWidth(30)
-    @ExcelProperty("检测地点")
+    @ExcelProperty(value = "检测地点",order = 7)
     private String natAddress;
 
 

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

@@ -14,10 +14,7 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.FileUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcNatDTO;
@@ -26,6 +23,7 @@ import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
+import com.epmet.dto.result.NatListCommonExcelResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcNatService;
@@ -268,15 +266,28 @@ public class IcNatController implements ResultDataResolver {
         try {
             // 这里 需要指定写用哪个class去写
             String fileName = "核酸检测信息.xlsx";
-            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response),NatListResultDTO.class).build();
+            if ("all".equals(formDTO.getOrgType())) {
+                excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NatListResultDTO.class).build();
+            }else {
+                excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NatListCommonExcelResultDTO.class).build();
+            }
+
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").build();
             PageData<NatListResultDTO> data = null;
             do {
                 data = icNucleinService.natList(formDTO);
-                data.getList().forEach(o->o.setNatResult(NumConstant.ONE_STR.equals(o.getNatResult())?"阳性":"阴性"));
+                data.getList().forEach(o-> {
+                    o.setNatResult(NumConstant.ONE_STR.equals(o.getNatResult()) ? "阳性" : "阴性");
+                    o.setIsResiUser(NumConstant.ONE_STR.equals(o.getNatResult()) ? "是" : "否");
+                });
                 formDTO.setPageNo(++pageNo);
-                excelWriter.write(data.getList(), writeSheet);
-            } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size()==formDTO.getPageSize());
+                if ("current".equals(formDTO.getOrgType())) {
+                    List<NatListResultDTO> list = ConvertUtils.sourceToTarget(data.getList(), NatListResultDTO.class);
+                    excelWriter.write(list, writeSheet);
+                }else{
+                    excelWriter.write(data.getList(), writeSheet);
+                }
+            } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize());
 
         }catch (Exception e){
             log.error("export exception", e);

epmet-user/epmet-user-server/src/main/resources/logback-spring.xml

@@ -142,7 +142,6 @@
     <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>