Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql

@@ -13,7 +13,7 @@ SELECT ID, `CODE`, `NAME`, `P_CODE`, `LEVEL`, `CATAGORY`, `DEL_FLAG`, `REVISION`
 SELECT * FROM area_code_new WHERE  county_code = '441900';
 
 #清空数据
-DELETE FROM area_code;
+DELETE FROM area_code where 1=1;
 #插入数据
 INSERT INTO `epmet_common_service`.`area_code`
 SELECT * FROM area_code_new;

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

@@ -154,8 +154,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delHouse(String houseId) {
-        //删除小区
-        icHouseService.deleteById(houseId);
+        //单个删除房屋，房屋内有居民不允许删除
+        NeighborHoodManageDelFormDTO formDTO=new NeighborHoodManageDelFormDTO();
+        formDTO.setType(CustomerGridConstant.HOUSE);
+        formDTO.setIds(Arrays.asList(houseId));
+        allDelete(formDTO);
     }
 
     @Override

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

@@ -278,7 +278,7 @@ public class IcNatController implements ResultDataResolver {
                 data = icNucleinService.natList(formDTO);
                 data.getList().forEach(o-> {
                     o.setNatResult(NumConstant.ONE_STR.equals(o.getNatResult()) ? "阳性" : "阴性");
-                    o.setIsResiUser(NumConstant.ONE_STR.equals(o.getNatResult()) ? "是" : "否");
+                    o.setIsResiUser(NumConstant.ONE_STR.equals(o.getIsResiUser()) ? "是" : "否");
                 });
                 formDTO.setPageNo(++pageNo);
                 if ("current".equals(formDTO.getOrgType())) {

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java

@@ -31,7 +31,6 @@ public class IcNatImportExcelData {
     @ExcelProperty("检测时间")
     private Date natTime;
 
-    @NotBlank(message = "检测地点为必填项")
     @ExcelProperty("检测地点")
     private String natAddress;
 

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

@@ -334,27 +334,29 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             // 合并到一起写入
             errorRows.addAll(otherRows);
 
-            // 生成并上传错误文件
-            try {
-                // 文件生成
-                Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
-                String fileName = UUID.randomUUID().toString().concat(".xlsx");
-                errorDescFile = errorDescDir.resolve(fileName);
-
-                FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
-                FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
-                OutputStream os = fileItem.getOutputStream();
-
-                EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
-
-                // 文件上传oss
-                Result<UploadImgResultDTO> errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
-                if (errorDesFileUploadResult.success()) {
-                    errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
-                }
-            } finally {
-                if (Files.exists(errorDescFile)) {
-                    Files.delete(errorDescFile);
+            // 生成并上传描述文件
+            if (errorRows.size() > 0) {
+                try {
+                    // 文件生成
+                    Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des");
+                    String fileName = UUID.randomUUID().toString().concat(".xlsx");
+                    errorDescFile = errorDescDir.resolve(fileName);
+
+                    FileItemFactory factory = new DiskFileItemFactory(16, errorDescDir.toFile());
+                    FileItem fileItem = factory.createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), true, fileName);
+                    OutputStream os = fileItem.getOutputStream();
+
+                    EasyExcel.write(os, IcNatImportExcelData.RowRemarkMessage.class).sheet("信息列表").doWrite(errorRows);
+                    // 文件上传oss
+                    Result<UploadImgResultDTO> errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem));
+                    if (errorDesFileUploadResult.success()) {
+                        errorDesFileUrl = errorDesFileUploadResult.getData().getUrl();
+                    }
+
+                } finally {
+                    if (Files.exists(errorDescFile)) {
+                        Files.delete(errorDescFile);
+                    }
                 }
             }