同步代码

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

@@ -3,6 +3,7 @@ package com.hungraim.ltc.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.disable.*;
+import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import com.hungraim.ltc.service.DisableService;
 import com.hungraim.ltc.util.Result;
@@ -339,35 +340,41 @@ public class DisableController {
      * 先把info的数据带出来，更改完，存到这个变更表
      */
     @PostMapping("/addDisInfoChange")
-    public void addDisInfochange(ChDisableInfoChange chDisableInfoChange){
+    public void addDisInfochange(ChDisableInfoChange chDisableInfoChange) {
         disableService.DisInfoChange(chDisableInfoChange);
     }
+
     /**
      * 失能人员信息变更-审核列表
      */
     @PostMapping("/listDisInfoChangeExamine")
-    public Result<List<DisableInfoChangeVo>> getListDisInfoChangeExamine(String organId,String districtProvince,boolean ishasLowOrgan
-            ,String districtCity,String districtArea,String realName,String certifNum,String aplOrganId,Short applyStatus){
-        return Result.success(disableService.ListDisInfoChangeExamine( organId, districtProvince, ishasLowOrgan
-                , districtCity, districtArea, realName, certifNum, aplOrganId, applyStatus));
+    public Result<Page<DisableInfoChangeVo>> getListDisInfoChangeExamine(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                                                         Long organId, Boolean isChildGroup, String districtProvincial, String districtCity, String districtArea,
+                                                                         String realName, String certiCode, String aplOrganName, Short applyStatus) {
+        Page<DisableInfoChangeVo> page = new Page<>(pageNum, pageSize);
+        page = disableService.ListDisInfoChangeExamine(page, organId, isChildGroup, districtProvincial
+                , districtCity, districtArea, realName, certiCode, aplOrganName, applyStatus);
+        return Result.success(page);
 
     }
+
     /**
      * 失能人员信息变更-审核
      * 审核通过再更新到info表
      */
     @PostMapping("/doDisInfoChangeExamine")
-    public void doDisInfoChangeExamine(String changeId,String checkName, Short applyStatus, String checkRemark){
-        disableService.DisableInfoChangeExamine( changeId, checkName, applyStatus,  checkRemark);
+    public void doDisInfoChangeExamine(String changeId, String checkName, Short applyStatus, String checkRemark) {
+        disableService.DisableInfoChangeExamine(changeId, checkName, applyStatus, checkRemark);
     }
+
     /**
      * 失能人员信息变更-列表-查看修改
      * 通过身份证搜索
      */
     @GetMapping("/searchByCertifNum")
-    public Result<DisableInfoChangeDetailVo> searchByCertifNum(String certifNum){
+    public Result<DisableInfoChangeDetailVo> searchByCertifNum(String certifNum) {
         DisableInfoChangeDetailVo disableInfoChangeDetailVo = disableService.searchChangeByCertifNum(certifNum);
-        if (disableInfoChangeDetailVo!=null){
+        if (disableInfoChangeDetailVo != null) {
             return Result.success(disableInfoChangeDetailVo);
         }
         return Result.failed("数据不一致");

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

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfoChange;
 import com.hungraim.ltc.pojo.vo.disable.DisableInfoChangeVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,8 +14,15 @@ public interface ChDisableInfoChangeMapper extends BaseMapper<ChDisableInfoChang
     /**
      * 失能人员信息变更-审核列表
      */
-    List<DisableInfoChangeVo> getListDisableInfoChange(String organId,String districtProvince,boolean ishasLowOrgan
-            ,String districtCity,String districtArea,String realName,String certifNum,String aplOrganId,Short applyStatus);
+    Page<DisableInfoChangeVo> getListDisableInfoChange(Page<DisableInfoChangeVo> page,
+                                                       @Param("organIds") List<Long> organIds,
+                                                       @Param("districtProvincial") String districtProvincial,
+                                                       @Param("districtCity") String districtCity,
+                                                       @Param("districtArea") String districtArea,
+                                                       @Param("realName") String realName,
+                                                       @Param("certiCode") String certiCode,
+                                                       @Param("aplOrganName") String aplOrganName,
+                                                       @Param("applyStatus") Short applyStatus);
     /**
      * 失能信息变更-查看修改
      */

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

@@ -5,6 +5,7 @@ import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import com.hungraim.ltc.util.Result;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -95,6 +96,7 @@ public interface DisableService {
 
     /**
      * 查询所有适用机构
+     *
      * @return 返回列表
      */
     List<ChFndOrgan> fndAllOrgan();
@@ -107,13 +109,14 @@ public interface DisableService {
     /**
      * 失能人员信息变更-审核
      */
-    void DisableInfoChangeExamine(String changeId,String checkName, Short applyStatus, String checkRemark);
+    void DisableInfoChangeExamine(String changeId, String checkName, Short applyStatus, String checkRemark);
 
     /**
      * 失能人员信息变更-审核列表
      */
-    List<DisableInfoChangeVo> ListDisInfoChangeExamine(String organId,String districtProvince,boolean ishasLowOrgan
-            ,String districtCity,String districtArea,String realName,String certifNum,String aplOrganId,Short applyStatus);
+    Page<DisableInfoChangeVo> ListDisInfoChangeExamine(Page<DisableInfoChangeVo> page,
+                                                       Long organId, Boolean isChildGroup, String districtProvincial, String districtCity, String districtArea,
+                                                       String realName, String certiCode, String aplOrganName, Short applyStatus);
 
     /**
      * 失能人员信息变更-查看修改

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

@@ -15,6 +15,7 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
 import com.hungraim.ltc.service.DisableService;
+import com.hungraim.ltc.service.OrganService;
 import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
@@ -46,6 +47,7 @@ public class DisableServiceImpl implements DisableService {
     private final AttachFeignService attachFeignService;
     private final ChDisableInfoChangeMapper chDisableInfoChangeMapper;
     private final DisableInfoHisMapper disableInfoHisMapper;
+    private final OrganService organService;
 
     /**
      * 获取机构ids
@@ -325,19 +327,19 @@ public class DisableServiceImpl implements DisableService {
         List<ChDisableInfo> disableInfoList = disableInfoMapper.selectList(new LambdaQueryWrapper<ChDisableInfo>()
                 .eq(ChDisableInfo::getRealName, chDisableInfoChange.getRealName())
                 .eq(ChDisableInfo::getCertiCode, chDisableInfoChange.getCertifNum()));
-        ChDisableInfo chDisableInfo=null;
-        if (disableInfoList.size()!=0){
+        ChDisableInfo chDisableInfo = null;
+        if (disableInfoList.size() != 0) {
             chDisableInfo = disableInfoList.get(0);
         }
         //更改完
         ChDisableInfoChange newDisableInfoChange = new ChDisableInfoChange();
-        BeanUtil.copyProperties(chDisableInfo,newDisableInfoChange);
+        BeanUtil.copyProperties(chDisableInfo, newDisableInfoChange);
         //存到这个变更表
         chDisableInfoChangeMapper.insert(newDisableInfoChange);
     }
 
     @Override
-    public void DisableInfoChangeExamine(String changeId,String checkName, Short applyStatus, String checkRemark) {
+    public void DisableInfoChangeExamine(String changeId, String checkName, Short applyStatus, String checkRemark) {
         Date date = new Date();
         //更新审核状态
         ChDisableInfoChange chDisableInfoChange = chDisableInfoChangeMapper.selectById(changeId);
@@ -369,18 +371,26 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
-    public List<DisableInfoChangeVo> ListDisInfoChangeExamine(String organId,String districtProvince,boolean ishasLowOrgan
-            ,String districtCity,String districtArea,String realName,String certifNum,String aplOrganId,Short applyStatus) {
-        List<DisableInfoChangeVo> listDisableInfoChange = chDisableInfoChangeMapper.getListDisableInfoChange(organId, districtProvince, ishasLowOrgan
-                , districtCity, districtArea, realName, certifNum, aplOrganId, applyStatus);
-        return listDisableInfoChange;
+    public Page<DisableInfoChangeVo> ListDisInfoChangeExamine(Page<DisableInfoChangeVo> page,
+                                                              Long organId, Boolean isChildGroup, String districtProvincial, String districtCity, String districtArea,
+                                                              String realName, String certiCode, String aplOrganName, Short applyStatus) {
+        List<Long> organIds = null;
+        if (organId != null) {
+            if (isChildGroup == null) {
+                isChildGroup = false;
+            }
+
+            organIds = organService.getOrganIds(organId, isChildGroup);
+        }
+        return chDisableInfoChangeMapper.getListDisableInfoChange(page, organIds, districtProvincial
+                , districtCity, districtArea, realName, certiCode, aplOrganName, applyStatus);
     }
 
     @Override
     public DisableInfoChangeDetailVo searchChangeByCertifNum(String certifNum) {
         ChDisableInfo chDisableInfo = disableInfoMapper.selectOne(new LambdaQueryWrapper<ChDisableInfo>().eq(ChDisableInfo::getCertiCode, certifNum));
-        DisableInfoChangeDetailVo disableInfoChangeDetailVo=null;
-        if (chDisableInfo!=null) {
+        DisableInfoChangeDetailVo disableInfoChangeDetailVo = null;
+        if (chDisableInfo != null) {
             disableInfoChangeDetailVo = new DisableInfoChangeDetailVo();
             BeanUtil.copyProperties(chDisableInfo, disableInfoChangeDetailVo);
         }