Merge branch 'dev'

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -395,7 +395,7 @@
     </select>
     <select id="getCheckResult" resultType="com.epmet.dto.screen.result.DataCheckDTO">
 	    SELECT
-            CUSTOMER_ID,
+            a.CUSTOMER_ID,
             AGENCY_ID AS agencyId,
         CASE
             AGENCY_ID
@@ -414,33 +414,21 @@
             WHEN 'c259c3b1d27f960b9b379fb2886179ba' THEN
             '洪范池镇'
             WHEN 'd20a7488eedf5bcfd5231c3771bc0e3d' THEN
-                '玫瑰镇'
-                ELSE '未知'
+            '玫瑰镇' ELSE '未知'
         END AS agencyName,
-            PROJECT_TOTAL AS reportCount,
             DATE_ID,
+            PROJECT_TOTAL AS reportCount,
+            COUNT( b.PROJECT_ID ) AS count
+        FROM
             (
             SELECT
-                count(*) AS dataCount
+                *
             FROM
-                screen_project_data
+                epmet_data_statistical.fact_agency_project_daily
             WHERE
                 1 = 1
-                AND CUSTOMER_ID = a.CUSTOMER_ID
-                AND ALL_PARENT_IDS LIKE CONCAT( '%', a.AGENCY_ID, '%' )
                 AND DEL_FLAG = '0'
-                AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) &lt;= DATE_ID
-            GROUP BY
-                AGENCY_ID
-            ORDER BY
-                AGENCY_ID
-            ) AS count
-        FROM
-            epmet_data_statistical.fact_agency_project_daily a
-        WHERE
-            1 = 1
-            AND del_flag = '0'
-            AND customer_id IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )
+                AND CUSTOMER_ID IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )
                 AND AGENCY_ID IN ( '1234085031077498881', '1215437824174608386', '1258587398679126017', 'c259c3b1d27f960b9b379fb2886179ba', 'd20a7488eedf5bcfd5231c3771bc0e3d', 'ea78a8e9252f567517c4a8d60250c714', 'f279343a67653fc20d8333c6b2e4dbee', 'f8d4a6af53b3fc5991ab1434b6ad39b8' )
                 <if test='null != dateId and "" != dateId'>
                     AND DATE_ID = #{dateId}
@@ -448,7 +436,19 @@
                 <if test='null != startDate and "" != startDate and null != endDate and "" != endDate'>
                     AND DATE_ID BETWEEN #{startDate} AND #{endDate}
                 </if>
+            ) a
+        LEFT JOIN (
+            SELECT
+                *
+            FROM
+                screen_project_data
+            WHERE
+                DEL_FLAG = '0'
+            AND CUSTOMER_ID IN ( '2fe0065f70ca0e23ce4c26fca5f1d933', '44876154d10d7cb7affd92000f84f833', '46c55cb862d6d5e6d05d2ab61a1cc07e', '6f203e30de1a65aab7e69c058826cd80' )) b ON b.CUSTOMER_ID = a.CUSTOMER_ID
+            AND ALL_PARENT_IDS LIKE CONCAT( '%', a.AGENCY_ID, '%' )
+            AND DATE_FORMAT( PROJECT_CREATE_TIME, '%Y%m%d' ) &lt;= DATE_ID
         GROUP BY
+            CUSTOMER_ID,
             AGENCY_ID,
             DATE_ID
         HAVING

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java

@@ -0,0 +1,51 @@
+package com.epmet.utils;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+
+/**
+ * 导入任务工具类，用于创建/完成导入工具
+ */
+public class ImportTaskUtils implements ResultDataResolver {
+
+    /**
+     * 创建导入任务，可能抛出8000异常，请考虑捕获异常
+     * @param originFileName 上传的文件的名称
+     * @param bizType 业务类型，见ImportTaskConstants常量
+     * @return Result
+     */
+    public static Result<ImportTaskCommonResultDTO> createImportTask(String originFileName, String bizType) {
+        ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
+        form.setOriginFileName(originFileName);
+        form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
+        form.setBizType(bizType);
+
+        return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form);
+    }
+
+    /**
+     * 结束导入任务
+     * @param taskId 任务ID
+     * @param processStatus 处理状态 见ImportTaskConstants
+     * @param resultDescFilePath 结果描述文件的路径
+     * @param resultDesc 结果简要描述文字
+     * @return Result
+     */
+    public static Result finishImportTask(String taskId, String processStatus, String resultDescFilePath, String resultDesc) {
+        ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
+        form.setTaskId(taskId);
+        form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
+        form.setProcessStatus(processStatus);
+        form.setResultDescFilePath(resultDescFilePath);
+        form.setResultDesc(resultDesc);
+
+        return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form);
+    }
+
+}

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

@@ -28,6 +28,7 @@ import com.epmet.dto.result.NatListCommonExcelResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcNatService;
+import com.epmet.utils.ImportTaskUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
@@ -221,12 +222,8 @@ public class IcNatController implements ResultDataResolver {
         }
 
         // 2.生成导入任务记录
-        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
-        importTaskForm.setOperatorId(userId);
-        importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_NAT);
-        importTaskForm.setOriginFileName(originalFilename);
-
-        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
+        ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(
+                ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_NAT),
                 ServiceConstant.EPMET_COMMON_SERVICE,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                 "excel导入核酸检测信息错误",

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

@@ -40,6 +40,7 @@ import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcNatService;
 import com.epmet.service.IcNoticeService;
 import com.epmet.service.UserService;
+import com.epmet.utils.ImportTaskUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -365,30 +366,23 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                 }
             }
 
-            ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
-            importFinishTaskForm.setTaskId(importTaskId);
-            importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
-            importFinishTaskForm.setOperatorId(userId);
-            importFinishTaskForm.setResultDesc("");
-            importFinishTaskForm.setResultDescFilePath(errorDesFileUrl);
+            // 完成导入
+            Result result = ImportTaskUtils.finishImportTask(importTaskId,
+                    failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,
+                    errorDesFileUrl,
+                    "");
 
-            Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
-                log.error("【核酸检测导入】finishImportTask失败");
+                log.error("【核酸检测导入】导入记录状态修改为'finished_success'失败");
             }
         } catch (Exception e) {
             String errorMsg = ExceptionUtils.getErrorStackTrace(e);
             log.error("【核酸检测导入】出错:{}", errorMsg);
 
-            ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
-            importFinishTaskForm.setTaskId(importTaskId);
-            importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
-            importFinishTaskForm.setOperatorId(userId);
-            importFinishTaskForm.setResultDesc("导入失败");
+            Result result = ImportTaskUtils.finishImportTask(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "导入失败");
 
-            Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {
-                log.error("【核酸检测导入】导入记录状态修改为'完成'失败");
+                log.error("【核酸检测导入】导入记录状态修改为'finished_fail'失败");
             }
         } finally {
             // 删除临时文件

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

@@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         OwnerRelationResultDTO result = new OwnerRelationResultDTO();
         //获取用户信息
         IcResiUserEntity user = baseDao.selectById(userId);
-
-        //获取用户所在家庭的户主
-        Result<IcHouseDTO> houseResult =  govOrgOpenFeignClient.get(user.getHomeId());
-        if (!houseResult.success()) {
-            throw new RenException(houseResult.getCode(),houseResult.getMsg());
-        }
-        result.setOwnerName(houseResult.getData().getOwnerName());
-
+        result.setOwnerName("");
         //获取用户所在家庭里所有人员信息
         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
@@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             if (userId.equals(item.getId())) {
                 bean.setIsSelf(NumConstant.ONE_STR);
             }
+            //如果与房主的关系是本人，则这个人就是房主
+            if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
+                result.setOwnerName(item.getName());
+            }
             return bean;
         }).collect(Collectors.toList());
         result.setUserList(userList);