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-04 16:54:47 +08:00
parent ecd770cc3d
commit b2782412d4
11 changed files with 91 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java
View File

@ -33,4 +33,8 @@ public interface ISuppliersApi {
IPage<SuppliersMaterialInfoDto> getSuppliersWlInfo(Integer pageNo, Integer pageSize, String title,String suppliersId);
SuppliersMaterialInfoDto editSuppliersWlInfo(SuppliersMaterialInfoDto suppliersMaterialInfoDto);
SuppliersApplyEntity getSupInfoByApplyId(String id);
SuppliersApplyEntity getShowInfoByOpenId(String openId);
}

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

@ -28,4 +28,6 @@ public interface NuBizSuppliersApplyMapper extends BaseMapper<NuBizSuppliersAppl
IPage<SuppliersApplyEntity> getSuppliersAuditLog(IPage<SuppliersApplyEntity> page, @Param("openId") String openId);
IPage<NuBizSuppliersApply> listPage(Page<NuBizSuppliersApply> page, @Param(Constants.WRAPPER) QueryWrapper<NuBizSuppliersApply> queryWrapper);
SuppliersApplyEntity getShowInfoByOpenId(@Param("openId") String openId);
}

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

@ -113,4 +113,11 @@
) sup
${ew.customSqlSegment}
</select>
<select id="getShowInfoByOpenId" resultType="com.nu.entity.SuppliersApplyEntity">
select a.*,b.apply_status,b.apply_content,a.id as suppliersId 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.open_id = #{openId}
</select>
</mapper>

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

@ -292,6 +292,22 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
return suppliersMaterialInfoDto;
}
@Override
public SuppliersApplyEntity getSupInfoByApplyId(String id) {
NuBizSuppliersApply nuBizSuppliersApply = baseMapper.selectById(id);
SuppliersApplyEntity suppliersApplyEntity = new SuppliersApplyEntity();
BeanUtils.copyProperties(nuBizSuppliersApply, suppliersApplyEntity);
return suppliersApplyEntity;
}
@Override
public SuppliersApplyEntity getShowInfoByOpenId(String openId) {
SuppliersApplyEntity nuBizSuppliersInfo =baseMapper.getShowInfoByOpenId(openId);
return nuBizSuppliersInfo;
}
@Override
public IPage<NuBizSuppliersApply> listPage(Page<NuBizSuppliersApply> page, QueryWrapper<NuBizSuppliersApply> queryWrapper) {
return baseMapper.listPage(page, queryWrapper);

1
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml
View File

@ -45,7 +45,6 @@
<select id="queryEmployeeInfo" resultType="com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo">
SELECT
adinfo.*,
<!-- (case when eo.apply_type = '2' then eo.modify_status else eo.status end) AS applyStatus,-->
eo.status as applyStatus,
eo.audit_content AS auditContent,
eo.modify_status as modifyStatus

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

@ -203,6 +203,7 @@ public class OrgAllInfo implements Serializable {
private String auditTime;
/**信息修改状态 空：没提交过修改 1修改申请中 2通过 3驳回*/
private String modifyState;
private String modifyStatus;
//0历史数据 1当前数据
private String izHistory;
}

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml
View File

@ -118,7 +118,7 @@
eo.entry_time,
eo.create_time AS apply_time,
eo.update_time AS audit_time,
eo.modify_status AS modify_state,
eo.modify_status AS modify_status,
eo.iz_history
from sys_depart d
inner join nu_biz_employees_org eo on d.org_code = eo.org_code

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

@ -465,7 +465,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
nuWxNotice.setIzRead("N");
nuWxNotice.setOrgCode(null);
nuWxNotice.setTitle("机构加盟审核");
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构加盟申请未通过，驳回原因：" + orgApplyInfo.getContent() == null ? "无" : orgApplyInfo.getContent());
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构加盟申请未通过，驳回原因：" + orgApplyInfo.getContent());
nuWxNotice.setType("org_apply_audit_list");
nuWxNotice.setClientType(WxClientType.INSTITUTION.getCode());
wxNoticeApi.addNotice(nuWxNotice);
@ -649,7 +649,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
nuWxNotice.setIzRead("N");
nuWxNotice.setOrgCode(null);
nuWxNotice.setTitle("机构信息变更审核");
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构信息变更申请未通过，驳回原因：" + orgApplyInfo.getContent() == null ? "无" : orgApplyInfo.getContent());
nuWxNotice.setContent("您好，您提交的" + orgApplyInfo.getComName() + "机构信息变更申请未通过，驳回原因：" + orgApplyInfo.getContent() );
nuWxNotice.setType("org_apply_audit_list");
nuWxNotice.setClientType(WxClientType.INSTITUTION.getCode());
wxNoticeApi.addNotice(nuWxNotice);

30
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
View File

@ -363,6 +363,36 @@ public class EmployeesMQListener {
employeesOrg.setIzFreeze("N");
employeesOrg.setApplyType("0");
employeesOrg.setIzHistory("N");
employeesOrg.setIdCardAddress(dto.getHouseAddress());
employeesOrg.setIdCard(dto.getIdCard());
employeesOrg.setTel(dto.getTel());
employeesOrg.setName(dto.getName());
employeesOrg.setSex(dto.getSex());
employeesOrg.setNational(dto.getNational());
employeesOrg.setBirthDate(dto.getDateOfBirth());
employeesOrg.setCardZmPath(dto.getIdCardPositive());
employeesOrg.setCardFmPath(dto.getIdCardNegative());
employeesOrg.setStartTime(dto.getStartTime());
employeesOrg.setEndTime(dto.getEndTime());
employeesOrg.setIssuingAuthority(dto.getIssuingAuthority());
employeesOrg.setMaritalStatus(dto.getMarriedOrNot());
employeesOrg.setHeight(dto.getHeight());
employeesOrg.setWeight(dto.getWeight());
employeesOrg.setHealthStatus(dto.getHealthStatus());
employeesOrg.setPoliticalAppearance(dto.getPoliticalAppearance());
employeesOrg.setContactName(dto.getEmergencyContact());
employeesOrg.setContactTel(dto.getEmergencyTel());
employeesOrg.setContactRelationship(dto.getEmergencyRelationship());
employeesOrg.setHukouType(dto.getHukouNature());
employeesOrg.setBankZmPath(dto.getBankPositive());
employeesOrg.setBankFmPath(dto.getBankNegative());
employeesOrg.setOpeningBank(dto.getOpeningBank());
employeesOrg.setBankCard(dto.getBankCard());
employeesOrg.setHealthZmPath(dto.getHealthCertificatePositive());
employeesOrg.setHealthFmPath(dto.getHealthCertificateNegative());
employeesOrg.setQualificationPath(dto.getQualification());
employeesOrg.setNoCrimeCertificate(dto.getNoCrimeCertificate());
employeesOrg.setCurrentAddress(dto.getCurrentAddress());
employeesOrgService.save(employeesOrg);
//增加机构邀请员工的消息通知

20
nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java
View File

@ -129,6 +129,14 @@ public class SuppliersApi {
}
@GetMapping(value = "/getShowInfoByOpenId")
public Result<SuppliersApplyEntity> getShowInfoByOpenId(
@RequestParam(value = "openId") String openId) {
SuppliersApplyEntity result = suppliersApi.getShowInfoByOpenId(openId);
return Result.OK(result);
}
@GetMapping(value = "/getSuppliersAuditLog")
public Result<IPage<SuppliersApplyEntity>> getSuppliersAuditLog(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -164,4 +172,16 @@ public class SuppliersApi {
return Result.OK(res);
}
/**
* 根据openId获取供应商信息
*
* @return
*/
@GetMapping(value = "/getSupInfoByApplyId")
public Result<SuppliersApplyEntity> getSupInfoByApplyId(@RequestParam(value = "id",required = false) String id) {
SuppliersApplyEntity result = suppliersApi.getSupInfoByApplyId(id);
return Result.OK(result);
}
}

8
nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java
View File

@ -1,6 +1,8 @@
package com.nu.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@ -109,4 +111,10 @@ public class EmployeesApplyMQDto implements Serializable {
* 现住址
*/
private String currentAddress;
/**出生日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
@DateTimeFormat(pattern="yyyy年MM月dd日")
private Date birthDate;
}