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

修改bug

This commit is contained in:
yangjun 2025-07-28 15:23:06 +08:00
parent 0fb358ba4c
commit d380981bcc
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/controller/OrgApplyInfoController.java
View File

@ -137,7 +137,7 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody OrgApplyInfo orgApplyInfo) { public Result<String> edit(@RequestBody OrgApplyInfo orgApplyInfo) {
orgApplyInfoService.audit(orgApplyInfo); orgApplyInfoService.audit(orgApplyInfo);
return Result.OK("保存成功!"); return Result.OK("审核完成!");
} }
/** /**

1
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgApplyInfo.java
View File

@ -235,6 +235,7 @@ public class OrgApplyInfo implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "审核时间") @ApiModelProperty(value = "审核时间")
private java.util.Date auditTime; private java.util.Date auditTime;
private String auditBy;
/**加盟时间*/ /**加盟时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
View File

@ -181,9 +181,11 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
@Override @Override
public void audit(OrgApplyInfo orgApplyInfo) { public void audit(OrgApplyInfo orgApplyInfo) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//机构加盟审核时传过来的status是2/3 //机构加盟审核时传过来的status是2/3
//机构信息变更时传过来的status是modifyPass和modifyFail //机构信息变更时传过来的status是modifyPass和modifyFail
orgApplyInfo.setAuditTime(new Date()); orgApplyInfo.setAuditTime(new Date());
orgApplyInfo.setAuditBy(user.getUsername());
OrgApplyInfo usedData = new OrgApplyInfo(); OrgApplyInfo usedData = new OrgApplyInfo();
//机构信息变更审核通过 //机构信息变更审核通过
if ("modifyPass".equals(orgApplyInfo.getStatus())) { if ("modifyPass".equals(orgApplyInfo.getStatus())) {
@ -317,6 +319,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
orgApplyInfoMQDto.setOperateBy(sysUser.getRealname()); orgApplyInfoMQDto.setOperateBy(sysUser.getRealname());
orgApplyInfoMQDto.setOperateTelephone(sysUser.getPhone()); orgApplyInfoMQDto.setOperateTelephone(sysUser.getPhone());
orgApplyInfoMQDto.setOperateEmail(sysUser.getEmail()); orgApplyInfoMQDto.setOperateEmail(sysUser.getEmail());
orgApplyInfoMQDto.setAuditStatus("审核成功");
// orgApplyInfoMQDto.setAuditBy(sysUser.getRealname());
// orgApplyInfoMQDto.setAuditTime(orgApplyInfo.getAuditTime());
//运维mq收到后 1、自动创建新的机构、机构附加信息 2、生成运维平台工单 //运维mq收到后 1、自动创建新的机构、机构附加信息 2、生成运维平台工单
rabbitMQUtil.sendToExchange("hldy.orgApply.build", "hldy.orgApply.build", orgApplyInfoMQDto); rabbitMQUtil.sendToExchange("hldy.orgApply.build", "hldy.orgApply.build", orgApplyInfoMQDto);
} }

3
nursing-unit-common/src/main/java/com/nu/dto/OrgApplyInfoMQDto.java
View File

@ -213,5 +213,8 @@ public class OrgApplyInfoMQDto implements Serializable {
//加盟上传合同操作人邮箱 //加盟上传合同操作人邮箱
private String operateEmail; private String operateEmail;
private String auditBy;
private String auditStatus;
} }

2
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
View File

@ -1950,7 +1950,7 @@ public class SysUserController {
orgApplyInfo.setBuildStatus("5"); orgApplyInfo.setBuildStatus("5");
orgApplyInfoService.updateById(orgApplyInfo); orgApplyInfoService.updateById(orgApplyInfo);
result.success("添加成功！"); result.success("初始化成功！账号：" + jsonObject.getString("userName") + " 密码：123456");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
result.error500("操作失败"); result.error500("操作失败");