社区网格核酸人员信息

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@@ -467,4 +467,17 @@ public class EpdcScreenController {
         List<EpdcScreenVaccinationDeptStatisticsDTO> data = epdcScreenService.epidemicVaccinationStatisticsNew(formDto);
         return new Result<List<EpdcScreenVaccinationDeptStatisticsDTO>>().ok(data);
     }
+
+    /**
+     * 社区网格核酸人员信息
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @author wgf
+     * @since 2022/4/13 10:10
+     */
+    @GetMapping("epidemic/getEpidemicUserInfoList")
+    public Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(@RequestBody ApiEpidemicUserInfoListFormDTO formDto){
+        List<ApiEpidemicUserInfoResultDTO> data = epdcScreenService.getEpidemicUserInfoList(formDto);
+        return new Result<List<ApiEpidemicUserInfoResultDTO>>().ok(data);
+    }
 }

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java

@@ -398,4 +398,13 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      * @since 2021/11/19 16:19
      */
     List<EpdcScreenVaccinationDeptStatisticsDTO> communityVaccinationData();
+
+    /**
+     * 社区网格核酸人员信息
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @author wgf
+     * @since 2022/4/13 10:10
+     */
+    List<ApiEpidemicUserInfoResultDTO> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto);
 }

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java

@@ -333,4 +333,13 @@ public interface EpdcScreenService {
     Result yqfkYmjzqkJobNew();
 
     List<EpdcScreenVaccinationDeptStatisticsDTO> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 社区网格核酸人员信息
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @author wgf
+     * @since 2022/4/13 10:10
+     */
+    List<ApiEpidemicUserInfoResultDTO> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto);
 }

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java

@@ -320,4 +320,11 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
             return baseDao.communityVaccinationData();
         }
     }
+
+    @Override
+    public List<ApiEpidemicUserInfoResultDTO> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) {
+
+        List<ApiEpidemicUserInfoResultDTO> list = baseDao.getEpidemicUserInfoList(formDto);
+        return list;
+    }
 }

epdc-cloud-analysis-pc/src/main/resources/logback-spring.xml

@@ -150,10 +150,10 @@
 
     <!-- 生产环境 -->
     <springProfile name="prod">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.elink.esua.epdc" level="INFO"/>
-        <root level="INFO">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -880,4 +880,23 @@
         ORDER BY
             ( ONE_SHOT_COMPLETED_NUM + TWO_SHOT_COMPLETED_NUM + THREE_SHOT_COMPLETED_NUM + STEADY_SHOT_COMPLETED_NUM ) DESC
     </select>
+
+    <select id="getEpidemicUserInfoList" parameterType="com.elink.esua.epdc.dto.analysis.pc.screen.form.ApiEpidemicUserInfoListFormDTO"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.ApiEpidemicUserInfoResultDTO">
+
+        select
+        u.USER_NAME,
+        dd.dict_name as GENDER,
+        u.MOBILE,
+        (case u.CHECK_STATE when '0' then '已检测' when '1' then '未检测' else '' end) CHECK_STATE,
+        d.dict_name as PEOPLE_CATEGORIES
+        from yushan_esua_epdc_custom.epidemic_user_info u
+        left join yushan_esua_epdc_admin.sys_dict d on d.dict_value = u.PEOPLE_CATEGORIES and d.dict_type = 'people_categories' and d.pid != '0'
+        left join yushan_esua_epdc_admin.sys_dict dd on dd.dict_value = u.GENDER and dd.dict_type = 'gender' and dd.pid != '0'
+        where u.DEL_FLAG = '0'
+        and u.CHECK_STATE = #{checkState}
+        and u.DEPT_ID = #{deptId}
+
+
+    </select>
 </mapper>