Merge remote-tracking branch 'origin/master'

apply/apply-service/src/main/java/com/hungraim/ltc/ApplyApplication.java → apply/apply-service/src/main/java/com/hungraim/ism/ApplyApplication.java

-package com.hungraim.ltc;
+package com.hungraim.ism;
 
 
 import org.springframework.boot.SpringApplication;

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java

+package com.hungraim.ism.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ism.pojo.vo.disable.ApplicationManagementListVO;
+import com.hungraim.ism.service.DisableService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import com.hungraim.ltc.util.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 失能申请Controller
+ *
+ * @author czz
+ */
+@RestController
+@RequestMapping("/disable")
+@Slf4j
+public class DisableController {
+
+    @Autowired
+    private DisableService disableService;
+
+    /**
+     * 待遇申请管理列表
+     *
+     * @param organId            适用机构代码
+     * @param districtProvincial 所在省
+     * @param districtCity       所在市
+     * @param districtArea       所在区域
+     * @param realName           参保人员姓名
+     * @param certiCode          参保人身份证号码
+     * @param treatmentType      待遇类型
+     * @param applyStatus        审核状态
+     * @return 待遇申请管理列表
+     */
+    @RequestMapping("/applicationManagementList")
+    public Result<List<ApplicationManagementListVO>> disableList(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, Short treatmentType, Short applyStatus) {
+        IPage<ChDisableApplyHis> iPage = disableService.listDisableInfoByPage(organId, districtProvincial, districtCity, districtArea, realName, certiCode, treatmentType, applyStatus, 1, 10);
+        List<ChDisableApplyHis> records = iPage.getRecords();
+        List<ApplicationManagementListVO> vos = new ArrayList<>();
+        for (ChDisableApplyHis chDisableApplyHis : records) {
+            ApplicationManagementListVO applicationManagementListVO = new ApplicationManagementListVO();
+            BeanUtil.copyProperties(chDisableApplyHis, applicationManagementListVO);
+            vos.add(applicationManagementListVO);
+        }
+        return Result.success(vos);
+    }
+
+}

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyHisMapper.java

+package com.hungraim.ism.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能人员申请历史Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
+}

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

+package com.hungraim.ism.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import org.springframework.stereotype.Service;
+
+/**
+ * 失能申请Service
+ *
+ * @author czz
+ */
+@Service
+public interface DisableService {
+
+    /**
+     * 查询所有资源对应的角色
+     *
+     * @param organId            适用机构代码
+     * @param districtProvincial 所在省
+     * @param districtCity       所在市
+     * @param districtArea       所在区域
+     * @param realName           参保人员姓名
+     * @param certiCode          参保人身份证号码
+     * @param treatmentType      待遇类型
+     * @param applyStatus        审核状态
+     * @return list
+     */
+    IPage<ChDisableApplyHis> listDisableInfoByPage(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, Short treatmentType, Short applyStatus, int page, int pageSize);
+
+}

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

+package com.hungraim.ism.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.dao.DisableApplyHisMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import com.hungraim.ism.service.DisableService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DisableServiceImpl implements DisableService {
+
+    @Autowired
+    private DisableApplyHisMapper disableApplyHisMapper;
+
+    @Override
+    public IPage<ChDisableApplyHis> listDisableInfoByPage(String organId, String districtProvincial, String districtCity,
+                                                          String districtArea, String realName, String certiCode, Short treatmentType,
+                                                          Short applyStatus, int page, int pageSize) {
+        QueryWrapper<ChDisableApplyHis> wrapper = new QueryWrapper<>();
+        ChDisableApplyHis chDisableApplyHis = new ChDisableApplyHis();
+        chDisableApplyHis.setOrganId(organId);
+        chDisableApplyHis.setDistrictProvincial(districtProvincial);
+        chDisableApplyHis.setDistrictCity(districtCity);
+        chDisableApplyHis.setDistrictArea(districtArea);
+        chDisableApplyHis.setRealName(realName);
+        chDisableApplyHis.setCertiCode(certiCode);
+        chDisableApplyHis.setTreatmentType(treatmentType);
+        chDisableApplyHis.setApplyStatus(applyStatus);
+        wrapper.setEntity(chDisableApplyHis);
+        return disableApplyHisMapper.selectPage(new Page<>(page, pageSize), wrapper);
+    }
+
+}
\ No newline at end of file

common/common-core/pom.xml

@@ -15,8 +15,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>7</source>
-                    <target>7</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/ApplicationManagementListVO.java

+package com.hungraim.ism.pojo.vo.disable;
+
+/**
+ * 待遇申请管理列表VO
+ */
+public class ApplicationManagementListVO {
+    //适用机构
+    //机构代码
+    private String organId;
+    //所在省市
+    //参保人姓名
+    //参保人身份证号码
+    //待遇类型
+    //联系人姓名
+    //联系人身份证号码
+    //申请人电话
+    //居住地址
+    //审核状态
+}