diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java
index e321077..16c171f 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/IssueInfo/entity/IssueInfo.java
@@ -71,5 +71,6 @@ public class IssueInfo implements Serializable {
/**发版机构*/
@Excel(name = "发版机构", width = 15)
@ApiModelProperty(value = "发版机构")
+ @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String orgName;
}
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 568509e..918740a 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
@@ -15,7 +15,7 @@
from sys_depart d
left join nu_org_apply_info o on d.id = o.pk_id
left join nu_biz_suppliers_org s on d.org_code = s.org_code and s.iz_history = 'N' and s.open_id = #{openId}
- where 1=1 and o.status = '2' and d.del_flag = '0'
+ where 1=1 and d.status = '1' and o.`status` = '2' and d.del_flag = '0'
and d.org_code IN
@@ -49,7 +49,7 @@
- and o.com_name like concat('%',#{title},'%')
+ and d.depart_name like concat('%',#{title},'%')
@@ -58,11 +58,15 @@
s.id as id,
d.id as org_id,
d.depart_name,
+ d.depart_name,
d.org_code,
concat(d.url,d.context_path) as server_url,
d.org_leader,
d.org_leader_phone,
d.org_address
+ d.org_leader,
+ d.org_leader_phone,
+ d.org_address
,s.`status` as suppliers_status
,s.audit_content
,s.create_time
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java
index e18fe8d..c487d2a 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java
@@ -19,6 +19,9 @@ import java.util.Date;
public class OrgAllInfo implements Serializable {
private static final long serialVersionUID = 1L;
+ /**id*/
+ private String id;
+
/**机构id*/
private String orgId;
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml
index 64bd495..c340544 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml
@@ -81,7 +81,32 @@
d.iz_directive_main,
d.iz_elder_tag_main,
d.media_url,
- o.*,
+ d.tel,
+ d.name,
+ d.sex,
+ d.national,
+ d.birth_date,
+ d.id_card_address,
+ d.id_card,
+ d.issuing_authority,
+ d.start_time,
+ d.end_time,
+ d.card_zm_path,
+ d.card_fm_path,
+ d.com_business_license,
+ d.com_name,
+ d.com_register_address,
+ d.com_credit_code,
+ d.com_legal_person,
+ d.org_address,
+ d.org_leader,
+ d.org_leader_phone,
+ d.org_building_number,
+ d.org_property_type,
+ d.org_building_area,
+ d.org_province,
+ d.org_city,
+ d.org_district,
eo.open_id,
eo.employees_id,
eo.org_code,
@@ -96,10 +121,9 @@
eo.modify_status AS modify_state,
eo.iz_history
from sys_depart d
- inner join nu_org_apply_info o on d.id = o.pk_id
inner join nu_biz_employees_org eo on d.org_code = eo.org_code
- o.status = '2'
+ d.status = '1'
and d.del_flag = '0'
AND eo.open_id = #{openId}
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java
index a6d80b3..8a92207 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java
@@ -180,7 +180,7 @@ public class SuppliersMQListener {
content1 = "您好,您提交的信息变更已通过";
content2 = "信息变更审核通过";
} else if (StringUtils.equals("modifyFail", suppliersInfoMQDto.getStatus())) {
- content1 = "您好,您提交的信息变更未通过";
+ content1 = "您好,您提交的信息变更未通过,驳回原因:"+suppliersInfoMQDto.getApplyContent();
content2 = "信息变更审核未通过";
}
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java
index ad92863..c1471ed 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/workorder/listener/WorkOrderMQListener.java
@@ -56,6 +56,9 @@ public class WorkOrderMQListener {
data.setNetUrl(workOrderMQDto.getNetUrl());
data.setAccountNo(workOrderMQDto.getAccountNo());
data.setPasswordText(workOrderMQDto.getPasswordText());
+ data.setUrl(workOrderMQDto.getUrl());
+ data.setContextPath(workOrderMQDto.getContextPath());
+ data.setMediaUrl(workOrderMQDto.getMediaUrl());
sysBaseAPI.updateById(data);
// var userInfo = { userName: record.tel, realname: record.name, orgCode: record.id, orgId: record.pkId }
diff --git a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java
index c998ff9..30539da 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/WorkOrderMQDto.java
@@ -56,4 +56,7 @@ public class WorkOrderMQDto implements Serializable {
private java.lang.String netUrl;
private java.lang.String accountNo;
private java.lang.String passwordText;
+ private java.lang.String url;
+ private java.lang.String mediaUrl;
+ private java.lang.String contextPath;
}