长者审核流程（未完成 临时提交）
This commit is contained in:
parent
e49f94e82c
commit
6896e46b58
|
|
@ -215,4 +215,36 @@ public class ElderInfoMQDto implements Serializable {
|
|||
* 机构名称
|
||||
*/
|
||||
private String departName;
|
||||
/**
|
||||
* 监护人信息变更状态 1修改申请中 2通过 3驳回
|
||||
*/
|
||||
private String guardianModifyStatus;
|
||||
|
||||
/**
|
||||
* 监护人信息变更驳回原因
|
||||
*/
|
||||
private String guardianModifyContent;
|
||||
|
||||
/**
|
||||
* 监护人变更信息对应子表id nu_biz_elder_modify_info.id
|
||||
*/
|
||||
private String guardianModifyId;
|
||||
|
||||
/**
|
||||
* 长者信息变更状态 1修改申请中 2通过 3驳回
|
||||
*/
|
||||
private String elderModifyStatus;
|
||||
|
||||
/**
|
||||
* 长者信息变更驳回原因
|
||||
*/
|
||||
private String elderModifyContent;
|
||||
|
||||
/**
|
||||
* 长者变更信息对应子表id nu_biz_elder_modify_info.id
|
||||
*/
|
||||
private String elderModifyId;
|
||||
|
||||
//需要变更谁的信息 zz长者 jhr监护人
|
||||
private String modifyType;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,5 +206,37 @@ public class ElderInfoEntity implements Serializable {
|
|||
* 兵役状况
|
||||
*/
|
||||
private String militaryType;
|
||||
/**
|
||||
* 监护人信息变更状态 1修改申请中 2通过 3驳回
|
||||
*/
|
||||
private String guardianModifyStatus;
|
||||
|
||||
/**
|
||||
* 监护人信息变更驳回原因
|
||||
*/
|
||||
private String guardianModifyContent;
|
||||
|
||||
/**
|
||||
* 监护人变更信息对应子表id nu_biz_elder_modify_info.id
|
||||
*/
|
||||
private String guardianModifyId;
|
||||
|
||||
/**
|
||||
* 长者信息变更状态 1修改申请中 2通过 3驳回
|
||||
*/
|
||||
private String elderModifyStatus;
|
||||
|
||||
/**
|
||||
* 长者信息变更驳回原因
|
||||
*/
|
||||
private String elderModifyContent;
|
||||
|
||||
/**
|
||||
* 长者变更信息对应子表id nu_biz_elder_modify_info.id
|
||||
*/
|
||||
private String elderModifyId;
|
||||
|
||||
//需要变更谁的信息 zz长者 jhr监护人
|
||||
private String modifyType;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -293,4 +293,46 @@ public class ElderInfo implements Serializable {
|
|||
*/
|
||||
private java.lang.String militaryType;
|
||||
|
||||
/**
|
||||
* 监护人信息变更状态 1修改申请中 2通过 3驳回
|
||||
*/
|
||||
@Excel(name = "监护人信息变更状态", width = 20)
|
||||
@ApiModelProperty(value = "监护人信息变更状态 1修改申请中 2通过 3驳回")
|
||||
private String guardianModifyStatus;
|
||||
|
||||
/**
|
||||
* 监护人信息变更驳回原因
|
||||
*/
|
||||
@Excel(name = "监护人信息变更驳回原因", width = 30)
|
||||
@ApiModelProperty(value = "监护人信息变更驳回原因")
|
||||
private String guardianModifyContent;
|
||||
|
||||
/**
|
||||
* 监护人变更信息对应子表id nu_biz_elder_modify_info.id
|
||||
*/
|
||||
@Excel(name = "监护人变更子表ID", width = 36)
|
||||
@ApiModelProperty(value = "监护人变更信息对应子表id nu_biz_elder_modify_info.id")
|
||||
private String guardianModifyId;
|
||||
|
||||
/**
|
||||
* 长者信息变更状态 1修改申请中 2通过 3驳回
|
||||
*/
|
||||
@Excel(name = "长者信息变更状态", width = 20)
|
||||
@ApiModelProperty(value = "长者信息变更状态 1修改申请中 2通过 3驳回")
|
||||
private String elderModifyStatus;
|
||||
|
||||
/**
|
||||
* 长者信息变更驳回原因
|
||||
*/
|
||||
@Excel(name = "长者信息变更驳回原因", width = 30)
|
||||
@ApiModelProperty(value = "长者信息变更驳回原因")
|
||||
private String elderModifyContent;
|
||||
|
||||
/**
|
||||
* 长者变更信息对应子表id nu_biz_elder_modify_info.id
|
||||
*/
|
||||
@Excel(name = "长者变更子表ID", width = 36)
|
||||
@ApiModelProperty(value = "长者变更信息对应子表id nu_biz_elder_modify_info.id")
|
||||
private String elderModifyId;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,180 @@
|
|||
package com.nu.modules.eldermofifyinfo.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.system.query.QueryRuleEnum;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo;
|
||||
import com.nu.modules.eldermofifyinfo.service.IElderModifyInfoService;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 长者相关信息变更记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-26
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="长者相关信息变更记录")
|
||||
@RestController
|
||||
@RequestMapping("/eldermofifyinfo/elderModifyInfo")
|
||||
@Slf4j
|
||||
public class ElderModifyInfoController extends JeecgController<ElderModifyInfo, IElderModifyInfoService> {
|
||||
@Autowired
|
||||
private IElderModifyInfoService elderModifyInfoService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param elderModifyInfo
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "长者相关信息变更记录-分页列表查询")
|
||||
@ApiOperation(value="长者相关信息变更记录-分页列表查询", notes="长者相关信息变更记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<ElderModifyInfo>> queryPageList(ElderModifyInfo elderModifyInfo,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<ElderModifyInfo> queryWrapper = QueryGenerator.initQueryWrapper(elderModifyInfo, req.getParameterMap());
|
||||
Page<ElderModifyInfo> page = new Page<ElderModifyInfo>(pageNo, pageSize);
|
||||
IPage<ElderModifyInfo> pageList = elderModifyInfoService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param elderModifyInfo
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "长者相关信息变更记录-添加")
|
||||
@ApiOperation(value="长者相关信息变更记录-添加", notes="长者相关信息变更记录-添加")
|
||||
@RequiresPermissions("eldermofifyinfo:nu_biz_elder_modify_info:add")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody ElderModifyInfo elderModifyInfo) {
|
||||
elderModifyInfoService.save(elderModifyInfo);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param elderModifyInfo
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "长者相关信息变更记录-编辑")
|
||||
@ApiOperation(value="长者相关信息变更记录-编辑", notes="长者相关信息变更记录-编辑")
|
||||
@RequiresPermissions("eldermofifyinfo:nu_biz_elder_modify_info:edit")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody ElderModifyInfo elderModifyInfo) {
|
||||
elderModifyInfoService.updateById(elderModifyInfo);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "长者相关信息变更记录-通过id删除")
|
||||
@ApiOperation(value="长者相关信息变更记录-通过id删除", notes="长者相关信息变更记录-通过id删除")
|
||||
@RequiresPermissions("eldermofifyinfo:nu_biz_elder_modify_info:delete")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||
elderModifyInfoService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "长者相关信息变更记录-批量删除")
|
||||
@ApiOperation(value="长者相关信息变更记录-批量删除", notes="长者相关信息变更记录-批量删除")
|
||||
@RequiresPermissions("eldermofifyinfo:nu_biz_elder_modify_info:deleteBatch")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.elderModifyInfoService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "长者相关信息变更记录-通过id查询")
|
||||
@ApiOperation(value="长者相关信息变更记录-通过id查询", notes="长者相关信息变更记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<ElderModifyInfo> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
ElderModifyInfo elderModifyInfo = elderModifyInfoService.getById(id);
|
||||
if(elderModifyInfo==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(elderModifyInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param elderModifyInfo
|
||||
*/
|
||||
@RequiresPermissions("eldermofifyinfo:nu_biz_elder_modify_info:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, ElderModifyInfo elderModifyInfo) {
|
||||
return super.exportXls(request, elderModifyInfo, ElderModifyInfo.class, "长者相关信息变更记录");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequiresPermissions("eldermofifyinfo:nu_biz_elder_modify_info:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, ElderModifyInfo.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,227 @@
|
|||
package com.nu.modules.eldermofifyinfo.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import org.jeecg.common.constant.ProvinceCityArea;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 长者相关信息变更记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-26
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("nu_biz_elder_modify_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_biz_elder_modify_info对象", description="长者相关信息变更记录")
|
||||
public class ElderModifyInfo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
/**护理单元*/
|
||||
@Excel(name = "护理单元", width = 15)
|
||||
@ApiModelProperty(value = "护理单元")
|
||||
private String nuId;
|
||||
/**姓名*/
|
||||
@Excel(name = "姓名", width = 15)
|
||||
@ApiModelProperty(value = "姓名")
|
||||
private String name;
|
||||
/**性别*/
|
||||
@Excel(name = "性别", width = 15)
|
||||
@ApiModelProperty(value = "性别")
|
||||
private String sex;
|
||||
/**年龄*/
|
||||
@Excel(name = "年龄", width = 15)
|
||||
@ApiModelProperty(value = "年龄")
|
||||
private String age;
|
||||
/**身份证号码*/
|
||||
@Excel(name = "身份证号码", width = 15)
|
||||
@ApiModelProperty(value = "身份证号码")
|
||||
private String idCard;
|
||||
/**出生日期*/
|
||||
@Excel(name = "出生日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "出生日期")
|
||||
private Date dateOfBirth;
|
||||
/**民族*/
|
||||
@Excel(name = "民族", width = 15)
|
||||
@ApiModelProperty(value = "民族")
|
||||
private String national;
|
||||
/**户籍所在地*/
|
||||
@Excel(name = "户籍所在地", width = 15)
|
||||
@ApiModelProperty(value = "户籍所在地")
|
||||
private String houseAddress;
|
||||
/**自理程度*/
|
||||
@Excel(name = "自理程度", width = 15)
|
||||
@ApiModelProperty(value = "自理程度")
|
||||
private String selfCareType;
|
||||
/**头像*/
|
||||
@Excel(name = "头像", width = 15)
|
||||
@ApiModelProperty(value = "头像")
|
||||
private String avatarPath;
|
||||
/**报销类型*/
|
||||
@Excel(name = "报销类型", width = 15)
|
||||
@ApiModelProperty(value = "报销类型")
|
||||
private String reimbType;
|
||||
/**医保类型*/
|
||||
@Excel(name = "医保类型", width = 15)
|
||||
@ApiModelProperty(value = "医保类型")
|
||||
private String medicalType;
|
||||
/**医保卡号*/
|
||||
@Excel(name = "医保卡号", width = 15)
|
||||
@ApiModelProperty(value = "医保卡号")
|
||||
private String medicalCard;
|
||||
/**文化程度*/
|
||||
@Excel(name = "文化程度", width = 15)
|
||||
@ApiModelProperty(value = "文化程度")
|
||||
private String educationLevel;
|
||||
/**婚姻状况*/
|
||||
@Excel(name = "婚姻状况", width = 15)
|
||||
@ApiModelProperty(value = "婚姻状况")
|
||||
private String maritalStatus;
|
||||
/**宗教信仰*/
|
||||
@Excel(name = "宗教信仰", width = 15)
|
||||
@ApiModelProperty(value = "宗教信仰")
|
||||
private String religiousBeliefs;
|
||||
/**身份证正面*/
|
||||
@Excel(name = "身份证正面", width = 15)
|
||||
@ApiModelProperty(value = "身份证正面")
|
||||
private String idCardPositive;
|
||||
/**身份证反面*/
|
||||
@Excel(name = "身份证反面", width = 15)
|
||||
@ApiModelProperty(value = "身份证反面")
|
||||
private String idCardNegative;
|
||||
/**户口本本人页*/
|
||||
@Excel(name = "户口本本人页", width = 15)
|
||||
@ApiModelProperty(value = "户口本本人页")
|
||||
private String accountBookHimself;
|
||||
/**医保卡正面*/
|
||||
@Excel(name = "医保卡正面", width = 15)
|
||||
@ApiModelProperty(value = "医保卡正面")
|
||||
private String frontMedical;
|
||||
/**医保卡反面*/
|
||||
@Excel(name = "医保卡反面", width = 15)
|
||||
@ApiModelProperty(value = "医保卡反面")
|
||||
private String negaticeMedical;
|
||||
/**备注*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String content;
|
||||
/**当前状态 0咨询 1入住 2留床 3退住*/
|
||||
@Excel(name = "当前状态 0咨询 1入住 2留床 3退住", width = 15)
|
||||
@ApiModelProperty(value = "当前状态 0咨询 1入住 2留床 3退住")
|
||||
private String currentState;
|
||||
/**监护人openid*/
|
||||
@Excel(name = "监护人openid", width = 15)
|
||||
@ApiModelProperty(value = "监护人openid")
|
||||
private String guardianOpenId;
|
||||
/**监护人姓名*/
|
||||
@Excel(name = "监护人姓名", width = 15)
|
||||
@ApiModelProperty(value = "监护人姓名")
|
||||
private String guardianName;
|
||||
/**关系*/
|
||||
@Excel(name = "关系", width = 15)
|
||||
@ApiModelProperty(value = "关系")
|
||||
private String relationship;
|
||||
/**监护人身份证号*/
|
||||
@Excel(name = "监护人身份证号", width = 15)
|
||||
@ApiModelProperty(value = "监护人身份证号")
|
||||
private String guardianIdCard;
|
||||
/**联系电话*/
|
||||
@Excel(name = "联系电话", width = 15)
|
||||
@ApiModelProperty(value = "联系电话")
|
||||
private String guardianPhone;
|
||||
/**监护人出生日期*/
|
||||
@Excel(name = "监护人出生日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "监护人出生日期")
|
||||
private Date guardianDateOfBirth;
|
||||
/**监护人家庭住址*/
|
||||
@Excel(name = "监护人家庭住址", width = 15)
|
||||
@ApiModelProperty(value = "监护人家庭住址")
|
||||
private String guardianHomeAddress;
|
||||
/**监护人工作单位*/
|
||||
@Excel(name = "监护人工作单位", width = 15)
|
||||
@ApiModelProperty(value = "监护人工作单位")
|
||||
private String guardianWorkUnit;
|
||||
/**家庭住址*/
|
||||
@Excel(name = "家庭住址", width = 15)
|
||||
@ApiModelProperty(value = "家庭住址")
|
||||
private String homeAddress;
|
||||
/**是否删除 0未删除 1删除*/
|
||||
@Excel(name = "是否删除 0未删除 1删除", width = 15)
|
||||
@ApiModelProperty(value = "是否删除 0未删除 1删除")
|
||||
@TableLogic
|
||||
private String delFlag;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
/**签发机关*/
|
||||
@Excel(name = "签发机关", width = 15)
|
||||
@ApiModelProperty(value = "签发机关")
|
||||
private String issuingAuthority;
|
||||
/**有效开始日期*/
|
||||
@Excel(name = "有效开始日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "有效开始日期")
|
||||
private Date startTime;
|
||||
/**有效结束日期*/
|
||||
@Excel(name = "有效结束日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "有效结束日期")
|
||||
private Date endTime;
|
||||
/**发卡日期*/
|
||||
@Excel(name = "发卡日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "发卡日期")
|
||||
private Date cardIssuing;
|
||||
/**血型*/
|
||||
@Excel(name = "血型", width = 15)
|
||||
@ApiModelProperty(value = "血型")
|
||||
private String bloodType;
|
||||
/**兵役状况*/
|
||||
@Excel(name = "兵役状况", width = 15)
|
||||
@ApiModelProperty(value = "兵役状况")
|
||||
private String militaryType;
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package com.nu.modules.eldermofifyinfo.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 长者相关信息变更记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-26
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface ElderModifyInfoMapper extends BaseMapper<ElderModifyInfo> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.eldermofifyinfo.mapper.ElderModifyInfoMapper">
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package com.nu.modules.eldermofifyinfo.service;
|
||||
|
||||
import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 长者相关信息变更记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-26
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IElderModifyInfoService extends IService<ElderModifyInfo> {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
package com.nu.modules.eldermofifyinfo.service.impl;
|
||||
|
||||
import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo;
|
||||
import com.nu.modules.eldermofifyinfo.mapper.ElderModifyInfoMapper;
|
||||
import com.nu.modules.eldermofifyinfo.service.IElderModifyInfoService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 长者相关信息变更记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2025-09-26
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class ElderModifyInfoServiceImpl extends ServiceImpl<ElderModifyInfoMapper, ElderModifyInfo> implements IElderModifyInfoService {
|
||||
|
||||
}
|
||||
|
|
@ -1,11 +1,14 @@
|
|||
package com.nu.modules.mq.elderinfo.listener;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.nu.dto.ElderInfoMQDto;
|
||||
import com.nu.modules.elderinfo.entity.ElderInfo;
|
||||
import com.nu.modules.elderinfo.service.IElderInfoService;
|
||||
import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo;
|
||||
import com.nu.modules.eldermofifyinfo.service.IElderModifyInfoService;
|
||||
import com.nu.modules.familymember.entity.FamilyMember;
|
||||
import com.nu.modules.familymember.service.IFamilyMemberService;
|
||||
import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog;
|
||||
|
|
@ -23,6 +26,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
|||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.cloud.commons.util.IdUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
|
@ -44,6 +48,8 @@ public class ElderInfoMQListener {
|
|||
private IMediaAsyncErrorLogService mediaAsyncErrorLogService;
|
||||
@Autowired
|
||||
private IFamilyMemberService familyMemberService;
|
||||
@Autowired
|
||||
private IElderModifyInfoService elderModifyInfoService;
|
||||
|
||||
/**
|
||||
* 新增长者信息
|
||||
|
|
@ -61,6 +67,7 @@ public class ElderInfoMQListener {
|
|||
elderInfoService.updateById(elderInfo);
|
||||
} else {
|
||||
//长者第一次入住机构
|
||||
elderInfo.setDelFlag("0");
|
||||
elderInfoService.save(elderInfo);
|
||||
}
|
||||
|
||||
|
|
@ -147,80 +154,80 @@ public class ElderInfoMQListener {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新长者信息
|
||||
*
|
||||
* @param dto
|
||||
*/
|
||||
@RabbitListener(bindings = @QueueBinding(value = @Queue(name = "#{elderInfoAsyncDQNP.getUpdateElderInfoQueueName()}"), exchange = @Exchange(name = "hldy.elder", type = ExchangeTypes.DIRECT), key = "#{elderInfoAsyncDQNP.getUpdateElderInfoKeyName()}"), errorHandler = "elderInfoMQErrorHandler")
|
||||
@Transactional(rollbackFor = {Exception.class})
|
||||
public void handleUpdateElderInfo(ElderInfoMQDto dto) {
|
||||
ElderInfo elderInfo = new ElderInfo();
|
||||
BeanUtils.copyProperties(dto, elderInfo);
|
||||
elderInfoService.updateById(elderInfo);
|
||||
|
||||
//去管理平台拉取资源
|
||||
{
|
||||
|
||||
JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
|
||||
String baseUrl = opeOpenUrl.getString("configValue");
|
||||
if (baseUrl.endsWith("/")) {
|
||||
baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
|
||||
}
|
||||
//身份证正面
|
||||
String idCardPositive = dto.getIdCardPositive();
|
||||
{
|
||||
if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
}
|
||||
String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
|
||||
String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
|
||||
if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
filePath = filePath.substring(1);
|
||||
}
|
||||
try {
|
||||
FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
|
||||
mediaAsyncErrorLog.setMediaid(idCardPositive);
|
||||
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
|
||||
log.error("修改老人信息-身份证正面文件拉取错误,老人id" + elderInfo.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//身份证反面
|
||||
String idCardNegative = dto.getIdCardNegative();
|
||||
{
|
||||
if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
}
|
||||
String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
|
||||
String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
|
||||
if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
filePath = filePath.substring(1);
|
||||
}
|
||||
try {
|
||||
FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
|
||||
mediaAsyncErrorLog.setMediaid(idCardNegative);
|
||||
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
|
||||
log.error("修改老人信息-身份证反面文件拉取错误,老人id" + elderInfo.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// /**
|
||||
// * 更新长者信息
|
||||
// *
|
||||
// * @param dto
|
||||
// */
|
||||
// @RabbitListener(bindings = @QueueBinding(value = @Queue(name = "#{elderInfoAsyncDQNP.getUpdateElderInfoQueueName()}"), exchange = @Exchange(name = "hldy.elder", type = ExchangeTypes.DIRECT), key = "#{elderInfoAsyncDQNP.getUpdateElderInfoKeyName()}"), errorHandler = "elderInfoMQErrorHandler")
|
||||
// @Transactional(rollbackFor = {Exception.class})
|
||||
// public void handleUpdateElderInfo(ElderInfoMQDto dto) {
|
||||
// ElderInfo elderInfo = new ElderInfo();
|
||||
// BeanUtils.copyProperties(dto, elderInfo);
|
||||
// elderInfoService.updateById(elderInfo);
|
||||
//
|
||||
// //去管理平台拉取资源
|
||||
// {
|
||||
//
|
||||
// JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
|
||||
// String baseUrl = opeOpenUrl.getString("configValue");
|
||||
// if (baseUrl.endsWith("/")) {
|
||||
// baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
|
||||
// }
|
||||
// //身份证正面
|
||||
// String idCardPositive = dto.getIdCardPositive();
|
||||
// {
|
||||
// if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
// if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
// }
|
||||
// String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
|
||||
// String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
|
||||
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
// filePath = filePath.substring(1);
|
||||
// }
|
||||
// try {
|
||||
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
|
||||
// mediaAsyncErrorLog.setMediaid(idCardPositive);
|
||||
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
|
||||
// log.error("修改老人信息-身份证正面文件拉取错误,老人id" + elderInfo.getId());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// //身份证反面
|
||||
// String idCardNegative = dto.getIdCardNegative();
|
||||
// {
|
||||
// if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
// if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
// String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
// if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
// upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
// }
|
||||
// String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
|
||||
// String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
|
||||
// if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
// filePath = filePath.substring(1);
|
||||
// }
|
||||
// try {
|
||||
// FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
// } catch (Exception e) {
|
||||
// e.printStackTrace();
|
||||
// MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
|
||||
// mediaAsyncErrorLog.setMediaid(idCardNegative);
|
||||
// mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
|
||||
// log.error("修改老人信息-身份证反面文件拉取错误,老人id" + elderInfo.getId());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
/**
|
||||
* 修改长者的联系人信息
|
||||
|
|
@ -252,4 +259,94 @@ public class ElderInfoMQListener {
|
|||
familyMember.setWorkUnit(dto.getGuardianWorkUnit());//工作单位
|
||||
familyMemberService.updateById(familyMember);//更新信息
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 更新长者/监护人信息
|
||||
*
|
||||
* @param dto
|
||||
*/
|
||||
@RabbitListener(bindings = @QueueBinding(value = @Queue(name = "#{elderInfoAsyncDQNP.getUpdateElderInfoQueueName()}"), exchange = @Exchange(name = "hldy.elder", type = ExchangeTypes.DIRECT), key = "#{elderInfoAsyncDQNP.getUpdateElderInfoKeyName()}"), errorHandler = "elderInfoMQErrorHandler")
|
||||
@Transactional(rollbackFor = {Exception.class})
|
||||
public void handleUpdateElderInfo(ElderInfoMQDto dto) {
|
||||
String modifyTableId = IdUtil.simpleUUID();
|
||||
ElderModifyInfo elderModifyInfo = new ElderModifyInfo();
|
||||
BeanUtils.copyProperties(dto, elderModifyInfo);
|
||||
elderModifyInfo.setId(modifyTableId);
|
||||
elderModifyInfoService.save(elderModifyInfo);
|
||||
|
||||
//去管理平台拉取资源
|
||||
{
|
||||
JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
|
||||
String baseUrl = opeOpenUrl.getString("configValue");
|
||||
if (baseUrl.endsWith("/")) {
|
||||
baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
|
||||
}
|
||||
//身份证正面
|
||||
String idCardPositive = dto.getIdCardPositive();
|
||||
{
|
||||
if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
if (StringUtils.isNotBlank(idCardPositive)) {
|
||||
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardPositive, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
}
|
||||
String filePath = idCardPositive.substring(0, idCardPositive.lastIndexOf("/"));
|
||||
String fileName = idCardPositive.substring(idCardPositive.lastIndexOf("/") + 1);
|
||||
if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
filePath = filePath.substring(1);
|
||||
}
|
||||
try {
|
||||
FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
|
||||
mediaAsyncErrorLog.setMediaid(idCardPositive);
|
||||
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
|
||||
log.error("修改老人相关信息-身份证正面文件拉取错误,老人id" + modifyTableId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//身份证反面
|
||||
String idCardNegative = dto.getIdCardNegative();
|
||||
{
|
||||
if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
if (StringUtils.isNotBlank(idCardNegative)) {
|
||||
String url = baseUrl + "/sys/common/open/static/" + URLEncoder.encode(idCardNegative, StandardCharsets.UTF_8).replace("%2F", "/") + "?name=" + SafetyUtil.getSecureKey();
|
||||
if (upLoadPath.endsWith("/") || upLoadPath.endsWith("\\")) {
|
||||
upLoadPath = upLoadPath.substring(0, upLoadPath.length() - 1);
|
||||
}
|
||||
String filePath = idCardNegative.substring(0, idCardNegative.lastIndexOf("/"));
|
||||
String fileName = idCardNegative.substring(idCardNegative.lastIndexOf("/") + 1);
|
||||
if (filePath.startsWith("/") || filePath.startsWith("\\")) {
|
||||
filePath = filePath.substring(1);
|
||||
}
|
||||
try {
|
||||
FileDownloader.downloadFile(url, upLoadPath + File.separator + filePath, fileName);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
MediaAsyncErrorLog mediaAsyncErrorLog = new MediaAsyncErrorLog();
|
||||
mediaAsyncErrorLog.setMediaid(idCardNegative);
|
||||
mediaAsyncErrorLogService.save(mediaAsyncErrorLog);
|
||||
log.error("修改老人相关信息-身份证反面文件拉取错误,老人id" + modifyTableId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//修改老人信息表相关状态
|
||||
ElderInfo elderInfo = new ElderInfo();
|
||||
elderInfo.setId(dto.getId());
|
||||
if("zz".equals(dto.getModifyType())){
|
||||
elderInfo.setElderModifyId(modifyTableId);
|
||||
elderInfo.setElderModifyStatus("1");
|
||||
elderInfo.setElderModifyContent("");
|
||||
}
|
||||
if("jhr".equals(dto.getModifyType())){
|
||||
elderInfo.setGuardianModifyId(modifyTableId);
|
||||
elderInfo.setGuardianModifyStatus("1");
|
||||
elderInfo.setGuardianModifyContent("");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue