失能人员信息变更详情页-查看修改新增等操作接口

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

@@ -337,14 +337,18 @@ public class DisableController {
     }
 
     /**
-     * 失能人员信息变更-新增
+     * 失能人员信息变更-新增修改
      * 先把info的数据带出来，更改完，存到这个变更表
      */
-    @PostMapping("/addDisInfoChange")
-    public void addDisInfochange(ChDisableInfoChange chDisableInfoChange) {
-        disableService.DisInfoChange(chDisableInfoChange);
+    @PostMapping("/addOrUpdateDisInfoChange")
+    public Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO) {
+        if (null == disableUpdateDetailVO.getDisabInfoId() || StrUtil.isBlank(disableUpdateDetailVO.getOrganId()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictProvince()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictCity()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictArea()) || StrUtil.isBlank(disableUpdateDetailVO.getRealName()) || StrUtil.isBlank(disableUpdateDetailVO.getCertifNum()) || null == disableUpdateDetailVO.getBirthday() || StrUtil.isBlank(disableUpdateDetailVO.getGender()) || StrUtil.isBlank(disableUpdateDetailVO.getTel()) || null == disableUpdateDetailVO.getRegist() || StrUtil.isBlank(disableUpdateDetailVO.getAcptProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptDetail()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvAddress()) || null == disableUpdateDetailVO.getAcptSrvType() || StrUtil.isBlank(disableUpdateDetailVO.getAddressProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressDetail()) || null == disableUpdateDetailVO.getAddressType() || StrUtil.isBlank(disableUpdateDetailVO.getChangeReason())) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        return disableService.addOrUpdateDisInfoChange(disableUpdateDetailVO);
     }
 
+
     /**
      * 失能人员信息变更-审核列表
      */
@@ -386,14 +390,32 @@ public class DisableController {
     }
 
     /**
-     * 失能人员信息详情（失能人员信息修改申请详情页面）
+     * 失能人员信息详情（失能人员信息修改申请详情页面-新增）
      *
      * @param disabInfoId 失能人员id
      * @return 失能信息详情
      */
     @RequestMapping("/disableInfoUpdateDetail")
     public Result<DisableUpdateDetailVO> disableInfoUpdateDetail(String disabInfoId) {
+        if (StrUtil.isBlank(disabInfoId)) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
         DisableUpdateDetailVO disableUpdateDetailVO = disableService.disableInfoUpdateDetail(disabInfoId);
         return Result.success(disableUpdateDetailVO);
     }
+
+    /**
+     * 失能人员变更信息详情(失能人员信息修改申请详情页面-查看、修改)
+     *
+     * @param changeId 变更id
+     * @return 失能人员变更信息详情
+     */
+    @RequestMapping("/changeDisableDetail")
+    public Result<DisableUpdateDetailVO> changeDisableDetail(Integer changeId) {
+        if (null == changeId) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        DisableUpdateDetailVO disableUpdateDetailVO = disableService.changeDisableDetail(changeId);
+        return Result.success(disableUpdateDetailVO);
+    }
 }

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

@@ -111,8 +111,9 @@ public interface DisableService {
 
     /**
      * 失能人员信息变更表-新增
+     * @param disableUpdateDetailVO
      */
-    void DisInfoChange(ChDisableInfoChange chDisableInfoChange);
+    Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO);
 
     /**
      * 失能人员信息变更-审核
@@ -132,4 +133,12 @@ public interface DisableService {
      * @return
      */
     IPage<SearchDisableSimpleVo> searchByRealName(Integer pageNum, Integer pageSize, String realName);
+
+    /**
+     * 失能人员变更信息详情(失能人员信息修改申请详情页面-查看、修改)
+     *
+     * @param changeId 变更id
+     * @return 失能人员变更信息详情
+     */
+    DisableUpdateDetailVO changeDisableDetail(Integer changeId);
 }

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

@@ -127,18 +127,40 @@ public class DisableServiceImpl implements DisableService {
         if (chDisableInfo != null) {
             DisableUpdateDetailVO disableUpdateDetailVo = new DisableUpdateDetailVO();
             BeanUtils.copyProperties(chDisableInfo, disableUpdateDetailVo);
-            try {
-                // TODO 需要确认信息表的附件类型
-                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(disabInfoId), AttachType.DISABLE.getUploadType());
-                if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
-                    disableUpdateDetailVo.setFileDataList(listResult.getData());
-                } else {
-                    log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
-                }
-            } catch (Exception e) {
-                log.error(e.getMessage());
-                e.printStackTrace();
-            }
+            // 手动设置一些字段不一样的
+            // 所在省
+            disableUpdateDetailVo.setDistrictProvince(chDisableInfo.getDistrictProvincial());
+            // 身份证号
+            disableUpdateDetailVo.setCertifNum(chDisableInfo.getCertiCode());
+            // 现住址省市区街道详细地址
+            disableUpdateDetailVo.setAddressProvincial(chDisableInfo.getAdressDistrictProvincial());
+            disableUpdateDetailVo.setAddressCity(chDisableInfo.getAdressDistrictCity());
+            disableUpdateDetailVo.setAddressArea(chDisableInfo.getAdressDistrictCode());
+            disableUpdateDetailVo.setAddressStreet(chDisableInfo.getStreet());
+            disableUpdateDetailVo.setAddressDetail(chDisableInfo.getAdressDetail());
+            // 接收评定详细地址
+            disableUpdateDetailVo.setAcptDetail(chDisableInfo.getAcptAddress());
+            // 代办人身份证号
+            disableUpdateDetailVo.setOperCertiNum(chDisableInfo.getOperCertiCode());
+            // 代办人省市区
+            disableUpdateDetailVo.setOperProvincial(chDisableInfo.getOperDistrictProvincial());
+            disableUpdateDetailVo.setOperCity(chDisableInfo.getOperDistrictCity());
+            disableUpdateDetailVo.setOperArea(chDisableInfo.getOperDistrictCode());
+            // 审核信息置空
+            disableUpdateDetailVo.setCheckName("");
+            disableUpdateDetailVo.setCheckRemark("");
+//            try {
+//                // TODO 需要确认信息表的附件类型
+//                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(disabInfoId), AttachType.DISABLE.getUploadType());
+//                if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+//                    disableUpdateDetailVo.setFileDataList(listResult.getData());
+//                } else {
+//                    log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
+//                }
+//            } catch (Exception e) {
+//                log.error(e.getMessage());
+//                e.printStackTrace();
+//            }
             return disableUpdateDetailVo;
         }
         return null;
@@ -347,8 +369,33 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
-    public void DisInfoChange(ChDisableInfoChange chDisableInfoChange) {
-        chDisableInfoChangeMapper.insert(chDisableInfoChange);
+    @Transactional(rollbackFor = Exception.class)
+    public Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO) {
+        // 添加或修改记录
+        Integer changeId = disableUpdateDetailVO.getChangeId();
+        ChDisableInfoChange chDisableInfoChange = new ChDisableInfoChange();
+        BeanUtils.copyProperties(disableUpdateDetailVO, chDisableInfoChange);
+        if (null == changeId) {
+            // 新增
+            chDisableInfoChange.setEffTime(new Date());
+            // 先校验没有正在进行中的变更
+            List<ChDisableInfoChange> chDisableInfoChangesCheck = chDisableInfoChangeMapper.selectList(new LambdaQueryWrapper<ChDisableInfoChange>().eq(ChDisableInfoChange::getDisabInfoId, disableUpdateDetailVO.getDisabInfoId()).ne(ChDisableInfoChange::getApplyStatus, 2));
+            if (chDisableInfoChangesCheck.size() > 0) {
+                return Result.failed("无法提交，已有进行中的变更申请");
+            }
+            chDisableInfoChangeMapper.insert(chDisableInfoChange);
+        } else {
+            // 修改
+            chDisableInfoChangeMapper.updateById(chDisableInfoChange);
+        }
+        // 同步修改附件
+        List<ChFndAttach> fileDataList = disableUpdateDetailVO.getFileDataList();
+        AttachUpdateVo attachUpdateVo = new AttachUpdateVo();
+        attachUpdateVo.setCtrlId(chDisableInfoChange.getChangeId().longValue());
+        attachUpdateVo.setAttachType(AttachType.DISABLE_UPDATE.getUploadType());
+        attachUpdateVo.setChFndAttachs(fileDataList);
+        attachFeignService.updateAttachs(attachUpdateVo);
+        return Result.success();
     }
 
     @Override
@@ -405,7 +452,26 @@ public class DisableServiceImpl implements DisableService {
         return chDisableInfoPage.convert(disableInfo -> {
             SearchDisableSimpleVo searchDisableSimpleVo = new SearchDisableSimpleVo();
             BeanUtils.copyProperties(disableInfo, searchDisableSimpleVo);
+            searchDisableSimpleVo.setCertifNum(disableInfo.getCertiCode());
             return searchDisableSimpleVo;
         });
     }
+
+    @Override
+    public DisableUpdateDetailVO changeDisableDetail(Integer changeId) {
+        ChDisableInfoChange chDisableInfoChange = chDisableInfoChangeMapper.selectById(changeId);
+        DisableUpdateDetailVO disableUpdateDetailVO = new DisableUpdateDetailVO();
+        BeanUtils.copyProperties(chDisableInfoChange, disableUpdateDetailVO);
+        try {
+            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(changeId.longValue(), AttachType.DISABLE_UPDATE.getUploadType());
+            if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+                disableUpdateDetailVO.setFileDataList(listResult.getData());
+            }
+        } catch (Exception e) {
+            log.error("获取失能人员变更附件失败：{}", e.getMessage());
+            e.printStackTrace();
+        }
+
+        return disableUpdateDetailVO;
+    }
 }
\ No newline at end of file

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

 package com.hungraim.ltc.pojo.entity.disable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -10,10 +13,12 @@ import java.util.Date;
  */
 @Data
 @TableName("CH_DISABLE_INFO_CHANGE")
+@KeySequence(value = "SEQ_CH_DISABLE_INFO_CHANGE")
 public class ChDisableInfoChange {
     /**
      * 变更id
      */
+    @TableId(value = "CHANGE_ID", type = IdType.INPUT)
     private Integer changeId;
 
     /**

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

@@ -9,6 +9,11 @@ import java.util.Date;
 public class DisableInfoChangeVo {
 
     /**
+     * 变更id
+     */
+    private Integer changeId;
+
+    /**
      * 适用机构
      */
     private String organName;

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

 package com.hungraim.ltc.pojo.vo.disable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -11,6 +13,8 @@ import java.util.List;
  */
 @Data
 public class DisableUpdateDetailVO {
+    // 变更id
+    private Integer changeId;
     // 失能人员信息id
     private Integer disabInfoId;
 //    // 失能人员id
@@ -20,21 +24,23 @@ public class DisableUpdateDetailVO {
     private String organId;
     private String organName;
     //所在省市
-    private String districtProvincial;
+    private String districtProvince;
     private String districtCity;
     private String districtArea;
     //申请人姓名
     private String realName;
     //身份证号码
-    private String certiCode;
+    private String certifNum;
     //出生年月日
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
     //性别
     private String gender;
     //手机
     private String tel;
     //所在户籍
-    private String regist;
+    private Integer regist;
     //固话
     private String fixedTel;
     //待遇类型
@@ -44,7 +50,7 @@ public class DisableUpdateDetailVO {
     private String acptCity;
     private String acptArea;
     private String acptStreet;
-    private String acptAddress;
+    private String acptDetail;
     //接受服务地址
     private String acptSrvProvincial;
     private String acptSrvCity;
@@ -52,31 +58,30 @@ public class DisableUpdateDetailVO {
     private String acptSrvStreet;
     private String acptSrvAddress;
     //接受服务地址类型(现在址：0,护理机构地址：1,其他：2,接受评定地址：3)
-    private Short acptSrvType;
+    private Integer acptSrvType;
     //现住址
-    private String adressDistrictProvincial;
-    private String adressDistrictCity;
-    private String adressDistrictCode;
-    private String street;
-    private String adressDetail;
+    private String addressProvincial;
+    private String addressCity;
+    private String addressArea;
+    private String addressStreet;
+    private String addressDetail;
     //现住址类型(0：接受评定地址；1：接受服务地址；2：其他)
-    private Short addressType;
+    private Integer addressType;
 
     //***代办人信息
     //姓名
     private String operName;
     //身份证号码
-    private String operCertiCode;
+    private String operCertiNum;
     //手机
     private String operTel;
     //与失能人员关系
-    private String operRelation;
-    //代办人固话
-    private String operFixedTel;
+    private Integer operRelation;
+
     //现住址
-    private String operDistrictProvince;
-    private String operDistrictCity;
-    private String operDistrictCode;
+    private String operProvincial;
+    private String operCity;
+    private String operArea;
     private String operStreet;
     private String operAddress;
 
@@ -84,14 +89,24 @@ public class DisableUpdateDetailVO {
     //***审核结果
     //审核人
     private String checkName;
-    //审核结果
-    private String applyStatus;
+    //状态（未提交:0;待审核:1;审核通过:2;不通过：3;删除:4;撤销:5）
+    private Short applyStatus;
     //备注
     private String checkRemark;
     // 复评原因
     private String reasonsReview;
     // 复评备注
     private String reasonsRemark;
+    /**
+     * 数据来源（网厅：0，核心：1）
+     */
+    private Integer dataFrom;
+
+    /**
+     * 变更原因说明
+     */
+    private String changeReason;
+
     // 附件列表
     private List<ChFndAttach> fileDataList;
 }

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

@@ -21,7 +21,7 @@ public class SearchDisableSimpleVo {
     /**
      * 身份证号
      */
-    private String certiCode;
+    private String certifNum;
 
     /**
      * 生日