From 7cfe5a375c52fbf0b2a2d784243374a497a14e18 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 27 Jun 2025 15:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F/=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OrgApplyInfoApiEntity.java | 4 + .../controller/OrgApplyInfoController.java | 271 ++++++++++-------- .../orgapplyinfo/entity/OrgApplyInfo.java | 56 ++-- .../mapper/OrgApplyInfoMapper.java | 1 + .../mapper/xml/OrgApplyInfoMapper.xml | 5 +- .../service/IOrgApplyInfoService.java | 6 + .../service/impl/OrgApplyInfoServiceImpl.java | 131 ++++++++- .../orgapplyinfo/api/OrgApplyInfoApi.java | 1 + 8 files changed, 331 insertions(+), 144 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java index 76d9cda..f4fa321 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfoApiEntity.java @@ -29,6 +29,8 @@ public class OrgApplyInfoApiEntity implements Serializable { /**id*/ private String id; + /**pkId 同表id*/ + private String pkId; /**微信id*/ private String openId; /**微信名称*/ @@ -37,6 +39,8 @@ public class OrgApplyInfoApiEntity implements Serializable { private String tel; /**状态 1审核中 2审核完成 3驳回 */ private String status; + /**变更状态 2变更完成 4变更申请中 5变更驳回 */ + private java.lang.String modifyStatus; /**审核备注*/ private String content; /**创建人*/ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java index f2c4f07..81e3565 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java @@ -10,6 +10,7 @@ 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; @@ -39,130 +40,158 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; - /** +/** * @Description: 机构加盟申请信息表 * @Author: 张明远 - * @Date: 2025-06-05 + * @Date: 2025-06-05 * @Version: V1.0 */ -@Api(tags="机构加盟申请信息表") +@Api(tags = "机构加盟申请信息表") @RestController @RequestMapping("/orgapplyinfo/orgApplyInfo") @Slf4j public class OrgApplyInfoController extends JeecgController { - @Autowired - private IOrgApplyInfoService orgApplyInfoService; - - /** - * 分页列表查询 - * - * @param orgApplyInfo - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "机构加盟申请信息表-分页列表查询") - @ApiOperation(value="机构加盟申请信息表-分页列表查询", notes="机构加盟申请信息表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(OrgApplyInfo orgApplyInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @Autowired + private IOrgApplyInfoService orgApplyInfoService; + + /** + * 分页列表查询 + * + * @param orgApplyInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "机构加盟申请信息表-分页列表查询") + @ApiOperation(value = "机构加盟申请信息表-分页列表查询", notes = "机构加盟申请信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(OrgApplyInfo orgApplyInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("izEntry", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(),customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = orgApplyInfoService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param orgApplyInfo - * @return - */ - @AutoLog(value = "机构加盟申请信息表-添加") - @ApiOperation(value="机构加盟申请信息表-添加", notes="机构加盟申请信息表-添加") - @RequiresPermissions("orgapplyinfo:nu_org_apply_info:add") - @PostMapping(value = "/add") - public Result add(@RequestBody OrgApplyInfo orgApplyInfo) { - orgApplyInfoService.save(orgApplyInfo); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param orgApplyInfo - * @return - */ - @AutoLog(value = "机构加盟申请信息表-编辑") - @ApiOperation(value="机构加盟申请信息表-编辑", notes="机构加盟申请信息表-编辑") - @RequiresPermissions("orgapplyinfo:nu_org_apply_info:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody OrgApplyInfo orgApplyInfo) { - orgApplyInfoService.updateById(orgApplyInfo); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "机构加盟申请信息表-通过id删除") - @ApiOperation(value="机构加盟申请信息表-通过id删除", notes="机构加盟申请信息表-通过id删除") - @RequiresPermissions("orgapplyinfo:nu_org_apply_info:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - orgApplyInfoService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "机构加盟申请信息表-批量删除") - @ApiOperation(value="机构加盟申请信息表-批量删除", notes="机构加盟申请信息表-批量删除") - @RequiresPermissions("orgapplyinfo:nu_org_apply_info:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.orgApplyInfoService.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 queryById(@RequestParam(name="id",required=true) String id) { - OrgApplyInfo orgApplyInfo = orgApplyInfoService.getById(id); - if(orgApplyInfo==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(orgApplyInfo); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap); + queryWrapper.in("status", new String[]{"1", "2", "3"}); + Page page = new Page(pageNo, pageSize); + IPage pageList = orgApplyInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } /** - * 导出excel - * - * @param request - * @param orgApplyInfo - */ + * 分页列表查询 + * + * @param orgApplyInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "机构信息变更申请-分页列表查询", notes = "机构信息变更申请-分页列表查询") + @GetMapping(value = "/modifyLlist") + public Result> modifyLlist(OrgApplyInfo orgApplyInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("izEntry", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orgApplyInfo, req.getParameterMap(), customeRuleMap); + queryWrapper.in("status", new String[]{"4", "5"}); + Page page = new Page(pageNo, pageSize); + IPage pageList = orgApplyInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param orgApplyInfo + * @return + */ + @AutoLog(value = "机构加盟申请信息表-添加") + @ApiOperation(value = "机构加盟申请信息表-添加", notes = "机构加盟申请信息表-添加") + @RequiresPermissions("orgapplyinfo:nu_org_apply_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody OrgApplyInfo orgApplyInfo) { + orgApplyInfoService.save(orgApplyInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param orgApplyInfo + * @return + */ + @AutoLog(value = "机构加盟申请信息表-编辑") + @ApiOperation(value = "机构加盟申请信息表-编辑", notes = "机构加盟申请信息表-编辑") + @RequiresPermissions("orgapplyinfo:nu_org_apply_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody OrgApplyInfo orgApplyInfo) { + orgApplyInfoService.audit(orgApplyInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "机构加盟申请信息表-通过id删除") + @ApiOperation(value = "机构加盟申请信息表-通过id删除", notes = "机构加盟申请信息表-通过id删除") + @RequiresPermissions("orgapplyinfo:nu_org_apply_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + orgApplyInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "机构加盟申请信息表-批量删除") + @ApiOperation(value = "机构加盟申请信息表-批量删除", notes = "机构加盟申请信息表-批量删除") + @RequiresPermissions("orgapplyinfo:nu_org_apply_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.orgApplyInfoService.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 queryById(@RequestParam(name = "id", required = true) String id) { + OrgApplyInfo orgApplyInfo = orgApplyInfoService.getById(id); + if (orgApplyInfo == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(orgApplyInfo); + } + + /** + * 导出excel + * + * @param request + * @param orgApplyInfo + */ @RequiresPermissions("orgapplyinfo:nu_org_apply_info:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OrgApplyInfo orgApplyInfo) { @@ -170,16 +199,28 @@ public class OrgApplyInfoController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OrgApplyInfo.class); } + + /** + * 获取变更信息 + * 查询同一信息（pkid相同） 的申请变更（status=4）和 当前使用的机构信息（status=2） 转换成对应的数据格式 + * @param orgApplyInfo + * @return + */ + @ApiOperation(value = "机构信息变更申请-获取变更信息", notes = "机构信息变更申请-获取变更信息") + @PostMapping(value = "/getModifyInfo") + public Result>> getModifyInfo(@RequestBody OrgApplyInfo orgApplyInfo) { + return Result.OK(orgApplyInfoService.getModifyInfo(orgApplyInfo)); + } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java index 615b0cc..a06da2a 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java @@ -1,22 +1,20 @@ package com.nu.modules.orgapplyinfo.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; - -import com.baomidou.mybatisplus.annotation.*; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -import lombok.Data; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 机构加盟申请信息表 @@ -36,6 +34,9 @@ public class OrgApplyInfo implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private java.lang.String id; + /**pkId 同表id*/ + @ApiModelProperty(value = "pkId") + private java.lang.String pkId; /**微信id*/ @Excel(name = "微信id", width = 15) @ApiModelProperty(value = "微信id") @@ -53,6 +54,11 @@ public class OrgApplyInfo implements Serializable { @Excel(name = "审批状态", width = 15) @ApiModelProperty(value = "审批状态") private java.lang.String status; + /**变更状态 2变更完成 4变更申请中 5变更驳回 */ + @Dict(dicCode = "org_apply_status") + @Excel(name = "变更状态 2变更完成 4变更申请中 5变更驳回", width = 15) + @ApiModelProperty(value = "变更状态 2变更完成 4变更申请中 5变更驳回") + private java.lang.String modifyStatus; /**审核备注*/ @Excel(name = "审核备注", width = 15) @ApiModelProperty(value = "审核备注") @@ -61,16 +67,16 @@ public class OrgApplyInfo implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; /**机构是否入驻0否 1是(是否入驻过）*/ @@ -90,9 +96,9 @@ public class OrgApplyInfo implements Serializable { @ApiModelProperty(value = "民族") private java.lang.String national; /**出生日期*/ - @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") + @Excel(name = "出生日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "出生日期") private java.util.Date birthDate; /**住址（身份证上）*/ @@ -108,15 +114,15 @@ public class OrgApplyInfo implements Serializable { @ApiModelProperty(value = "签发机关") private java.lang.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") + @Excel(name = "有效开始日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "有效开始日期") private java.util.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") + @Excel(name = "有效结束日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "有效结束日期") private java.util.Date endTime; /**身份证正面*/ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java index 77f1024..78e7345 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/OrgApplyInfoMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface OrgApplyInfoMapper extends BaseMapper { + void realDelete(@Param("pkId") String pkId); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index a53429a..f47a9b4 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -2,4 +2,7 @@ - \ No newline at end of file + + delete from nu_org_apply_info where pk_id = #{pkId} and status = '5' + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java index 226e0e4..265ef8d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/IOrgApplyInfoService.java @@ -3,6 +3,9 @@ package com.nu.modules.orgapplyinfo.service; import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + /** * @Description: 机构加盟申请信息表 * @Author: 张明远 @@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IOrgApplyInfoService extends IService { + List> getModifyInfo(OrgApplyInfo orgApplyInfo); + + void audit(OrgApplyInfo orgApplyInfo); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java index 5684f47..e2bfdb5 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.nu.modules.orgapplyinfo.service.impl; +import cn.hutool.core.collection.ListUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi; @@ -9,12 +11,15 @@ import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity; import com.nu.modules.orgapplyinfo.mapper.OrgApplyInfoMapper; import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService; import com.nu.utils.DictUtils; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.lang.reflect.Field; +import java.text.SimpleDateFormat; +import java.util.*; /** * @Description: 机构加盟申请信息表 @@ -34,6 +39,23 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + qw.eq("pk_id", orgApplyInfo.getPkId()); + qw.eq("status", "2"); + OrgApplyInfo updateData = new OrgApplyInfo(); + updateData.setModifyStatus("4"); + baseMapper.update(updateData, qw); + } return orgApplyInfoApiEntity; } @@ -45,14 +67,14 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl queryAuditInfo(String openId,String id, String status) { + public List queryAuditInfo(String openId, String id, String status) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("open_id", openId); if (StringUtils.isNotBlank(id)) { qw.eq("id", id); } if (StringUtils.isNotBlank(status)) { - qw.eq("status", status); + qw.in("status", status.split(",")); } qw.orderByDesc("create_time"); List list = baseMapper.selectList(qw); @@ -68,4 +90,107 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl> getModifyInfo(OrgApplyInfo orgApplyInfo) { + // 1. 查询数据库获取两条记录 + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pk_id", orgApplyInfo.getPkId()); + qw.orderByDesc("create_time"); + qw.in("status", new String[]{"2", "4"}); + List list = baseMapper.selectList(qw); + + if (list == null || list.size() < 2) { + return Collections.emptyList(); + } + + OrgApplyInfo modifyData = list.get(0); // 修改后的数据 + OrgApplyInfo usingData = list.get(1); // 原始数据 + + // 2. 准备结果列表 + List> result = new ArrayList<>(); + + // 3. 获取所有字段 + Field[] fields = OrgApplyInfo.class.getDeclaredFields(); + + // 4. 遍历每个字段进行比较 + for (Field field : fields) { + try { + // 跳过序列化ID和不需要的字段 + if (field.getName().equals("serialVersionUID") || + field.isAnnotationPresent(TableField.class) && + field.getAnnotation(TableField.class).exist() == false) { + continue; + } + + // 设置可访问以获取私有字段值 + field.setAccessible(true); + + // 创建结果map + Map fieldMap = new HashMap<>(); + + // 获取字段名和值 + String fieldName = field.getName(); + Object modifyValue = field.get(modifyData); + Object usingValue = field.get(usingData); + + // 处理特殊类型的值 + if (field.getType() == Date.class) { + modifyValue = modifyValue != null ? new SimpleDateFormat("yyyy-MM-dd").format((Date) modifyValue) : null; + usingValue = usingValue != null ? new SimpleDateFormat("yyyy-MM-dd").format((Date) usingValue) : null; + } + + // 填充结果map + fieldMap.put("d1", fieldName); // 字段名 + fieldMap.put("d2", usingValue); // 原始值 + fieldMap.put("d3", modifyValue); // 修改后的值 + fieldMap.put("d4", Objects.equals(usingValue, modifyValue) ? "相同" : "不同"); // 比较结果 + + result.add(fieldMap); + + } catch (IllegalAccessException e) { + // 忽略无法访问的字段 + continue; + } + } + + return result; + } + + @Override + public void audit(OrgApplyInfo orgApplyInfo) { + OrgApplyInfo usedData = new OrgApplyInfo(); + //机构信息变更审核通过 + if ("modifyPass".equals(orgApplyInfo.getStatus())) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pk_id",orgApplyInfo.getPkId()); + qw.eq("status","2"); + OrgApplyInfo o_ = baseMapper.selectOne(qw); + //把上一条数据设置为历史数据 同时变更“信息变更状态” + o_.setModifyStatus("2"); + o_.setStatus("0"); + baseMapper.updateById(o_); + + //将变更后数据设置为正在使用的数据 + orgApplyInfo.setStatus("2"); + orgApplyInfo.setModifyStatus("2"); + baseMapper.updateById(orgApplyInfo); + } else if ("modifyFail".equals(orgApplyInfo.getStatus())) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pk_id",orgApplyInfo.getPkId()); + qw.eq("status","2"); + OrgApplyInfo o_ = baseMapper.selectOne(qw); + //机构信息变更审核被驳回 + o_.setModifyStatus("5"); + baseMapper.updateById(o_); + + //将变更后数据设置为被驳回状态 + orgApplyInfo.setStatus("5"); + baseMapper.updateById(orgApplyInfo); + }else{ + //机构加盟审批流程 + baseMapper.updateById(orgApplyInfo); + } + + } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java index 8ef6cdb..5066a84 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java @@ -65,4 +65,5 @@ public class OrgApplyInfoApi { } return Result.ok(orgApplyInfoApi.queryAuditInfo(openId, id,status)); } + }