From 704448f43b6f7b76186613137d4a5dfd2768771a Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 1 Jul 2025 15:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=BA=E6=9E=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84=E5=87=BA?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=9F=E3=80=81=E6=9C=89=E6=95=88=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=AD=89=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OrgApplyInfoApiEntity.java | 10 ++-- .../orgapplyinfo/entity/OrgApplyInfo.java | 24 +++++++-- .../service/impl/OrgApplyInfoServiceImpl.java | 49 ++++++++++++------- 3 files changed, 58 insertions(+), 25 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 f4fa321..c4b3ae9 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 @@ -60,7 +60,7 @@ public class OrgApplyInfoApiEntity implements Serializable { /**民族*/ private String national; /**出生日期*/ - @JsonFormat(pattern = "yyyy年MM月dd日") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日") @DateTimeFormat(pattern = "yyyy年MM月dd日") private Date birthDate; /**住址（身份证上）*/ @@ -70,11 +70,11 @@ public class OrgApplyInfoApiEntity implements Serializable { /**签发机关*/ private String issuingAuthority; /**有效开始日期*/ - @JsonFormat(pattern = "yyyy.MM.dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") @DateTimeFormat(pattern = "yyyy.MM.dd") private Date startTime; /**有效结束日期*/ - @JsonFormat(pattern = "yyyy.MM.dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") @DateTimeFormat(pattern = "yyyy.MM.dd") private Date endTime; /**身份证正面*/ @@ -116,6 +116,8 @@ public class OrgApplyInfoApiEntity implements Serializable { /**机构区域 sys_category.id*/ private java.lang.String orgDistrict; private java.lang.String orgDistrict_dictText; - + private java.util.Date commitTime;//提交时间 + private java.util.Date auditTime;//审核时间 + private java.util.Date franchiseTime;//加盟时间 } 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 a06da2a..0fbd86d 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 @@ -54,10 +54,10 @@ public class OrgApplyInfo implements Serializable { @Excel(name = "审批状态", width = 15) @ApiModelProperty(value = "审批状态") private java.lang.String status; - /**变更状态 2变更完成 4变更申请中 5变更驳回 */ + /**变更状态 0可修改 1不可修改 */ @Dict(dicCode = "org_apply_status") - @Excel(name = "变更状态 2变更完成 4变更申请中 5变更驳回", width = 15) - @ApiModelProperty(value = "变更状态 2变更完成 4变更申请中 5变更驳回") + @Excel(name = "变更状态 0可修改 1不可修改", width = 15) + @ApiModelProperty(value = "变更状态 0可修改 1不可修改") private java.lang.String modifyStatus; /**审核备注*/ @Excel(name = "审核备注", width = 15) @@ -208,4 +208,22 @@ public class OrgApplyInfo implements Serializable { @TableField(exist = false) private java.lang.String orgDistrict_dictText; + /**提交时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "提交时间") + private java.util.Date commitTime; + + /**审核时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "审核时间") + private java.util.Date auditTime; + + /**加盟时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "加盟时间") + private java.util.Date franchiseTime; + } 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 6b5332f..f2973fe 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,5 +1,6 @@ package com.nu.modules.orgapplyinfo.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableField; @@ -11,6 +12,7 @@ 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.collections.ListUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; @@ -38,6 +40,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("pk_id", orgApplyInfo.getPkId()); - qw.eq("status", "2"); +// qw.eq("status", "2"); OrgApplyInfo updateData = new OrgApplyInfo(); - updateData.setModifyStatus("4"); + updateData.setModifyStatus("1"); baseMapper.update(updateData, qw); } return orgApplyInfoApiEntity; @@ -86,8 +88,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl result = JSON.parseArray(jsonStr, OrgApplyInfoApiEntity.class); + List result = BeanUtil.copyToList(list, OrgApplyInfoApiEntity.class); return result; } @@ -160,12 +161,13 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("pk_id",orgApplyInfo.getPkId()); - qw.eq("status","2"); + qw.eq("pk_id", orgApplyInfo.getPkId()); + qw.eq("status", "2"); OrgApplyInfo o_ = baseMapper.selectOne(qw); //把上一条数据设置为历史数据 同时变更“信息变更状态” o_.setModifyStatus("2"); @@ -174,21 +176,32 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl(); + qw.eq("pk_id", orgApplyInfo.getPkId()); + OrgApplyInfo upData_ = new OrgApplyInfo(); + upData_.setModifyStatus("0"); + baseMapper.update(upData_, qw); } else if ("modifyFail".equals(orgApplyInfo.getStatus())) { + //将同pkid的可修改状态改为可修改 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_); + qw = new QueryWrapper<>(); + qw.eq("pk_id", orgApplyInfo.getPkId()); + OrgApplyInfo upData_ = new OrgApplyInfo(); + upData_.setModifyStatus("0"); + baseMapper.update(upData_, qw); //将变更后数据设置为被驳回状态 orgApplyInfo.setStatus("5"); baseMapper.updateById(orgApplyInfo); - }else{ + + } else { + if ("2".equals(orgApplyInfo.getStatus())) { + orgApplyInfo.setFranchiseTime(new Date()); + } //机构加盟审批流程 baseMapper.updateById(orgApplyInfo); }