yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-03-17 17:27:25 +08:00
parent 545f388192
commit 9cd9c4817e
7 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java
View File

@ -121,6 +121,11 @@ public class NuBizSuppliersApply implements Serializable {
private String suppliersId; private String suppliersId;
private String izHistory; private String izHistory;
private String headPath; 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) @TableField(exist = false)
private String status; private String status;

8
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml
View File

@ -81,7 +81,9 @@
ifnull(b.apply_status,'2') as apply_status, ifnull(b.apply_status,'2') as apply_status,
a.id AS suppliers_id, a.id AS suppliers_id,
b.apply_content as apply_content, b.apply_content as apply_content,
a.open_id a.open_id,
b.apply_time,
b.apply_by
FROM nu_biz_suppliers_info a FROM nu_biz_suppliers_info a
LEFT JOIN nu_biz_suppliers_apply b ON a.id = b.suppliers_id AND b.iz_history = 'N' LEFT JOIN nu_biz_suppliers_apply b ON a.id = b.suppliers_id AND b.iz_history = 'N'
WHERE a.del_flag = '0' WHERE a.del_flag = '0'
@ -105,7 +107,9 @@
b.apply_status AS apply_status, b.apply_status AS apply_status,
b.suppliers_id AS suppliers_id, b.suppliers_id AS suppliers_id,
b.apply_content, b.apply_content,
b.open_id b.open_id,
b.apply_time,
b.apply_by
FROM nu_biz_suppliers_apply b FROM nu_biz_suppliers_apply b
WHERE b.suppliers_id is null WHERE b.suppliers_id is null
AND b.opt_type = '入驻' AND b.opt_type = '入驻'

8
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java
View File

@ -28,6 +28,8 @@ import com.nu.modules.wxnotice.IWxNoticeApi;
import com.nu.utils.DictUtils; import com.nu.utils.DictUtils;
import com.nu.utils.RabbitMQUtil; import com.nu.utils.RabbitMQUtil;
import org.apache.commons.lang.StringUtils; 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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -319,6 +321,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
//变更后数据 //变更后数据
NuBizSuppliersApply one = baseMapper.selectById(nuBizSuppliersApply.getId()); NuBizSuppliersApply one = baseMapper.selectById(nuBizSuppliersApply.getId());
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//变更审核通过 //变更审核通过
NuBizSuppliersApply apply = new NuBizSuppliersApply(); NuBizSuppliersApply apply = new NuBizSuppliersApply();
apply.setId(nuBizSuppliersApply.getId()); apply.setId(nuBizSuppliersApply.getId());
@ -347,6 +350,8 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
apply.setApplyStatus("3"); apply.setApplyStatus("3");
apply.setApplyContent(nuBizSuppliersApply.getApplyContent()); apply.setApplyContent(nuBizSuppliersApply.getApplyContent());
} }
apply.setApplyTime(new Date());
apply.setApplyBy(loginUser.getRealname());
baseMapper.updateById(apply); baseMapper.updateById(apply);
@ -572,6 +577,9 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
apply.setApplyStatus("5"); apply.setApplyStatus("5");
apply.setApplyContent(nuBizSuppliersApply.getApplyContent()); apply.setApplyContent(nuBizSuppliersApply.getApplyContent());
} }
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
apply.setApplyTime(new Date());
apply.setApplyBy(loginUser.getRealname());
baseMapper.updateById(apply); baseMapper.updateById(apply);
String content1 = ""; String content1 = "";

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java
View File

@ -153,7 +153,7 @@ public class WorkOrderMQListener {
try { try {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("code", "SMS_501816065"); jsonObject.put("code", "SMS_503750025");
// jsonObject.put("name", workOrderMQDto.getFrontPath()); // jsonObject.put("name", workOrderMQDto.getFrontPath());
// jsonObject.put("username", workOrderMQDto.getAccountNo()); // jsonObject.put("username", workOrderMQDto.getAccountNo());
// jsonObject.put("password", workOrderMQDto.getPasswordText()); // jsonObject.put("password", workOrderMQDto.getPasswordText());

4
nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
View File

@ -15,11 +15,11 @@ public enum DySmsEnum {
/**修改密码短信模板编码*/ /**修改密码短信模板编码*/
CHANGE_PASSWORD_TEMPLATE_CODE("SMS_465391221","敲敲云","code"), CHANGE_PASSWORD_TEMPLATE_CODE("SMS_465391221","敲敲云","code"),
/**注册账号短信模板编码*/ /**注册账号短信模板编码*/
REGISTER_TEMPLATE_CODE("SMS_319245237","敲敲云","code"), REGISTER_TEMPLATE_CODE("SMS_503760019","敲敲云","code"),
/** /**
* 机构入驻-平台搭建完成 * 机构入驻-平台搭建完成
*/ */
JIGOURUZHU_DAJIANWANCHENG("SMS_501816065","护理单元-机构平台搭建完成","code"); JIGOURUZHU_DAJIANWANCHENG("SMS_503750025","护理单元-机构平台搭建完成","code");
/** /**
* 短信模板编码 * 短信模板编码

6
nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
View File

@ -268,7 +268,7 @@ jeecg:
# 短信模板 # 短信模板
sms-template: sms-template:
# 签名 # 签名
signature: 吉林省捌零信创科技 signature: 捌零信创
# 模板code # 模板code
templateCode: templateCode:
# 登录短信、忘记密码模板编码 # 登录短信、忘记密码模板编码
@ -276,9 +276,9 @@ jeecg:
# 修改密码短信模板编码 # 修改密码短信模板编码
SMS_465391221: SMS_465391221:
# 注册账号短信模板编码 # 注册账号短信模板编码
SMS_175430166: SMS_319245237 SMS_175430166: SMS_503760019
# 机构加盟审核通过通知 # 机构加盟审核通过通知
SMS_501816065: SMS_501816065 SMS_503750025: SMS_503750025
# 在线预览文件服务器地址配置 # 在线预览文件服务器地址配置
file-view-domain: http://fileview.jeecg.com file-view-domain: http://fileview.jeecg.com
# minio文件上传 # minio文件上传

6
nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml
View File

@ -267,7 +267,7 @@ jeecg:
# 短信模板 # 短信模板
sms-template: sms-template:
# 签名 # 签名
signature: 吉林省捌零信创科技 signature: 捌零信创
# 模板code # 模板code
templateCode: templateCode:
# 登录短信、忘记密码模板编码 # 登录短信、忘记密码模板编码
@ -275,9 +275,9 @@ jeecg:
# 修改密码短信模板编码 # 修改密码短信模板编码
SMS_465391221: SMS_465391221:
# 注册账号短信模板编码 # 注册账号短信模板编码
SMS_175430166: SMS_319245237 SMS_175430166: SMS_503760019
# 机构加盟审核通过通知 # 机构加盟审核通过通知
SMS_501816065: SMS_501816065 SMS_503750025: SMS_503750025
# 在线预览文件服务器地址配置 # 在线预览文件服务器地址配置
file-view-domain: http://fileview.jeecg.com file-view-domain: http://fileview.jeecg.com
# minio文件上传 # minio文件上传