From 9cd9c4817ee9c85fa6be71bcb98b234e9da45c60 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 17 Mar 2026 17:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bizSuppliers/entity/NuBizSuppliersApply.java | 5 +++++ .../bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml | 8 ++++++-- .../service/impl/NuBizSuppliersApplyServiceImpl.java | 8 ++++++++ .../com/nu/mq/workorder/listener/WorkOrderMQListener.java | 2 +- .../java/org/jeecg/common/constant/enums/DySmsEnum.java | 4 ++-- .../src/main/resources/application-dev.yml | 6 +++--- .../src/main/resources/application-uat.yml | 6 +++--- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java index 448a288..8762df9 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java @@ -121,6 +121,11 @@ public class NuBizSuppliersApply implements Serializable { private String suppliersId; private String izHistory; private String headPath; + private String applyBy; + @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 applyTime; @TableField(exist = false) private String status; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml index 340122a..a7e19e4 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml @@ -81,7 +81,9 @@ ifnull(b.apply_status,'2') as apply_status, a.id AS suppliers_id, b.apply_content as apply_content, - a.open_id + a.open_id, + b.apply_time, + b.apply_by FROM nu_biz_suppliers_info a LEFT JOIN nu_biz_suppliers_apply b ON a.id = b.suppliers_id AND b.iz_history = 'N' WHERE a.del_flag = '0' @@ -105,7 +107,9 @@ b.apply_status AS apply_status, b.suppliers_id AS suppliers_id, b.apply_content, - b.open_id + b.open_id, + b.apply_time, + b.apply_by FROM nu_biz_suppliers_apply b WHERE b.suppliers_id is null AND b.opt_type = '入驻' diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java index f2dc0a5..0cd4522 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java @@ -28,6 +28,8 @@ import com.nu.modules.wxnotice.IWxNoticeApi; import com.nu.utils.DictUtils; import com.nu.utils.RabbitMQUtil; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -319,6 +321,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl