Merge remote-tracking branch 'origin/master'

apply/apply-service/pom.xml

@@ -78,6 +78,33 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+
+        <!--Excel导入导出-->
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.1.3.Final</version>
+        </dependency>
+
+
+
+
     </dependencies>
 
     <build>

apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableApplyMapper.java

@@ -8,7 +8,9 @@ import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO;
 import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.vo.disable.ExamineRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -32,9 +34,9 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * @param srvOrganName 护理机构
      * @param applyMethod  申请方式(1首次申请、2复评申请、3动态评估)
      */
-    Page<DisableVO> disableList(Page<DisableVO> page, List<String> organIds, String provincial,
-                                String city, String area, String name, String certiCode,
-                                String dataFrom, String srvOrganName, Integer applyMethod);
+    Page<DisableVO> disableList(Page<DisableVO> page, @Param("organIds") List<String> organIds, @Param("provincial")String provincial,
+                                @Param("city")String city, @Param("area")String area, @Param("name")String name, @Param("certiCode")String certiCode,
+                                @Param("dataFrom")String dataFrom, @Param("srvOrganName")String srvOrganName, @Param("applyMethod")Integer applyMethod);
 
 
     DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);
@@ -42,4 +44,8 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
     List<ExamineRecord> listExamineRecordByApplyId(String applyId);
 
     DisableInfoVO getDisableInfo(String disableInfoId);
+
+    List<DisableVO> disableExportList(@Param(value = "organIds") List<String> organIds, @Param("provincial")String provincial,
+                                      @Param("city")String city, @Param("area")String area,@Param("name") String name, @Param("certiCode")String certiCode,
+                                      @Param("dataFrom")String dataFrom, @Param("applyMethod")Integer applyMethod);
 }

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import com.hungraim.ltc.util.Result;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -143,4 +144,20 @@ public interface DisableService {
      * @return 失能人员变更信息详情
      */
     DisableUpdateDetailVO changeDisableDetail(Integer changeId);
+
+    /**
+     *@author zwl
+     * @param organId
+     * @param districtProvincial
+     * @param districtCity
+     * @param districtArea
+     * @param realName
+     * @param certiCode
+     * @param dataFrom
+     * @param applyMethod
+     *@return org.apache.poi.ss.usermodel.Workbook
+     **/
+    Workbook disableDownload(String organId, String districtProvincial, String districtCity,
+                             String districtArea, String realName, String certiCode, String dataFrom,
+                             Integer applyMethod);
 }

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

 package com.hungraim.ltc.service.impl;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -25,11 +28,13 @@ import com.hungraim.ltc.util.ResultCode;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.awt.print.Book;
 import java.util.*;
 
 @Service
@@ -507,4 +512,33 @@ public class DisableServiceImpl implements DisableService {
 
         return disableUpdateDetailVO;
     }
+
+
+    @Override
+    public Workbook disableDownload(String organId, String districtProvincial, String districtCity,
+                                    String districtArea, String realName, String certiCode, String dataFrom,
+                                    Integer applyMethod) {
+        // 没有organId参数的时候，这个集合就为null
+        List<String> organIds = null;
+        if (StrUtil.isNotBlank(organId)) {
+            organIds = Arrays.asList(organId.split(","));
+        }
+        List<DisableVO> records = disableApplyMapper.disableExportList(organIds, districtProvincial,
+                districtCity, districtArea, realName, certiCode, dataFrom, applyMethod);
+        List<DisableExportVO> disableExportVOList = new ArrayList<>();
+        for (DisableVO record : records) {
+            DisableExportVO disableExportVO = new DisableExportVO();
+            BeanUtil.copyProperties(record,disableExportVO);
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(record.getProvincial()).append(record.getCity()).append(record.getArea());
+            disableExportVO.setProvinCialcityArea(stringBuilder.toString());
+            disableExportVOList.add(disableExportVO);
+        }
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.XSSF); // 对应xlsx
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DisableExportVO.class, disableExportVOList);
+
+        return workbook;
+    }
+
 }

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -174,4 +174,65 @@
         where disable.disab_info_id = #{disableInfoId}
     </select>
 
+
+
+    <select id="disableExportList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableVO">
+        select a.APPLY_ID applyId,
+        o.ORGAN_NAME organName,
+        a.organ_id organId,
+        a.DISTRICT_PROVINCIAL provincial,
+        a.DISTRICT_CITY city,
+        a.DISTRICT_AREA area,
+        a.REAL_NAME name,
+        a.birthday birthday,
+        a.CERTI_CODE certiCode,
+        a.TREATMENT_TYPE treatmentTyte,
+        a.OPER_NAME operName,
+        a.gender gender,
+        a.OPER_CERTI_CODE operCertiCode,
+        a.tel tel,
+        a.fixed_tel fixedTel,
+        m.MODE_NAME srvModeName,
+        a.DISE_TYPE_S diseTypeS,
+        a.eff_time effTime,
+        a.data_from dataFrom,
+        a.APPLY_STATUS applyStatus,
+        a.APPLY_METHOD applyMethod
+        from CH_DISABLE_APPLY a
+        LEFT JOIN CH_FND_ORGAN o ON a.organ_id = o.ORGAN_ID
+        LEFT JOIN CH_CFG_SRV_MODE m ON a.srv_mode_id = m.MODE_ID
+        LEFT JOIN CH_SRV_ORGAN s ON a.SRV_ORGAN_ID = s.SRV_ORGAN_ID
+        <where>
+
+            <if test="organIds != null">
+                and a.organ_id in
+                <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+                    #{organId}
+                </foreach>
+            </if>
+            <if test="applyMethod != null and applyMethod != ''">
+                and a.APPLY_METHOD = #{applyMethod}
+            </if>
+            <if test="provincial != null and provincial != ''">
+                and a.DISTRICT_PROVINCIAL = #{provincial}
+            </if>
+            <if test="city != null and city != ''">
+                and a.DISTRICT_CITY = #{city}
+            </if>
+            <if test="area != null and area != ''">
+                and a.DISTRICT_AREA = #{area}
+            </if>
+            <if test="name != null and name != ''">
+                and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
+            </if>
+            <if test="certiCode != null and certiCode != ''">
+                and a.CERTI_CODE = #{certiCode}
+            </if>
+            <if test="dataFrom != null and dataFrom != ''">
+                and a.DATA_FROM = #{dataFrom}
+            </if>
+
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file

common/common-core/pom.xml

@@ -56,6 +56,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java

@@ -597,6 +597,16 @@ public class ChDisableApply extends PageInfo implements Serializable {
      */
     private Short treatmentType;
 
+    /**
+     *银行卡号
+     */
+    private String bankCardNo;
+
+    /**
+     *医保统筹区
+     */
+    private String medicalArea;
+
     @TableField(exist = false)
     private List<ChFndAttach> fileDataList;
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExportVO.java

+package com.hungraim.ltc.pojo.vo.disable;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zwl
+ * @ClassName DisableExportVO
+ * @description
+ * @date 2023/1/7 16:12
+ **/
+
+@Data
+public class DisableExportVO implements Serializable {
+
+    //失能人员姓名
+    @Excel(name = "失能人员姓名")
+    private String name;
+
+    //失能人员身份证号码
+    @Excel(name = "身份证号码")
+    private String certiCode;
+
+
+    //性别
+    @Excel(name = "性别")
+    private String gender;
+
+    //联系人姓名
+    @Excel(name = "联系人姓名")
+    private String opername;
+
+    //失能人员手机号
+    @Excel(name = "手机号码")
+    private String tel;
+
+    //失能人员固话
+    @Excel(name = "座机号码")
+    private String fixedtel;
+
+    @Excel(name = "地址")
+    private String provinCialcityArea;
+
+
+    //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
+    @Excel(name = "来源")
+    private String dataFrom;
+
+    // 申请类别
+    @Excel(name = "申请类别")
+    private Integer applyMethod;
+
+    //申请服务方式
+    @Excel(name = "申请服务方式")
+    private String srvModeName;
+
+
+
+
+
+
+}

system/system-api/src/main/java/com/hungraim/ltc/api/SystemAdminFeignService.java

@@ -21,7 +21,7 @@ public interface SystemAdminFeignService {
      * @return 用户信息
      */
     @GetMapping("/api.system/user/loadUserInfoByAccount/{account}")
-    Result<SystemUser> loadUserInfoByAccount(@PathVariable String account);
+    Result<SystemUser> loadUserInfoByAccount(@PathVariable("account") String account);
 
     /**
      * feign api 根据用户id获取用户权限列表
@@ -30,7 +30,7 @@ public interface SystemAdminFeignService {
      * @return 权限列表
      */
     @GetMapping("/api.system/user/loadUserRolesByUserId/{id}")
-    Result<List<Long>> loadUserRolesByUserId(@PathVariable Long id);
+    Result<List<Long>> loadUserRolesByUserId(@PathVariable("id") Long id);
 
 
   /**