diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java index 0abd210..226d7e9 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java @@ -128,5 +128,9 @@ public class AdvisoryInfo implements Serializable { private String statusName; @TableField(exist = false) private String token; + @TableField(exist = false) + private String headPath;//长者头像 + @TableField(exist = false) + private String guardianHeadPath;//监护人头像 } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java index da0abcc..e548c42 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/entity/NuBizAllMaterialInfo.java @@ -68,6 +68,10 @@ public class NuBizAllMaterialInfo implements Serializable { @Excel(name = "品牌型号", width = 15) @ApiModelProperty(value = "品牌型号") private java.lang.String brandType; + /**生产厂家*/ + @Excel(name = "生产厂家", width = 15) + @ApiModelProperty(value = "生产厂家") + private java.lang.String manufacturer; /**销售单价*/ @Excel(name = "销售单价", width = 15) @ApiModelProperty(value = "销售单价") diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/service/impl/NuBizAllMaterialInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/service/impl/NuBizAllMaterialInfoServiceImpl.java index 2e1227a..68a23bd 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/service/impl/NuBizAllMaterialInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/allMaterialInfo/service/impl/NuBizAllMaterialInfoServiceImpl.java @@ -99,18 +99,24 @@ public class NuBizAllMaterialInfoServiceImpl extends ServiceImpl { + List groupBySuppInfo(@Param("suppliersId") String suppliersId); } 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/mapper/xml/NuBizSuppliersOrgMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml index 1ed59b8..c736ea5 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java index 6a88b06..2f56565 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java @@ -3,6 +3,8 @@ package com.nu.modules.bizSuppliers.service; import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @Description: 供应商-机构中间表 * @Author: jeecg-boot @@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface INuBizSuppliersOrgService extends IService { + List groupBySuppInfo(String suppliersId); } 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..cbd062a 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; @@ -290,6 +292,16 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl supList = suppliersOrgService.groupBySuppInfo(suppliersMaterialInfoDto.getSuppliersId()); + SuppliersMaterialInfoDto suppliersInfoMQDto = new SuppliersMaterialInfoDto(); + suppliersInfoMQDto.setId(suppliersMaterialInfoDto.getId()); + suppliersInfoMQDto.setSalesUnit(suppliersMaterialInfoDto.getSalesUnit()); + suppliersInfoMQDto.setSalesUnitPrice(suppliersMaterialInfoDto.getSalesUnitPrice()); + for (NuBizSuppliersOrg nuBizSuppliersOrg : supList){ + rabbitMQUtil.sendToExchange("nu.suppliers.applyStatus", nuBizSuppliersOrg.getOrgCode() + ".suppliers.updateMaterialInfo", suppliersInfoMQDto); + } + return suppliersMaterialInfoDto; } @@ -319,6 +331,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl extend = Maps.newHashMap(); @@ -572,6 +587,9 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl implements INuBizSuppliersOrgService { + @Override + public List groupBySuppInfo(String suppliersId) { + return baseMapper.groupBySuppInfo(suppliersId); + } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index df1d7b3..d2f0fd1 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -88,6 +88,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value)); } - queryWrapper.in("status", "2,3".split(",")); + queryWrapper.in("status", "1,2,3".split(",")); IPage pageList = orgApplyInfoService.page(page, queryWrapper); return Result.OK(pageList); } 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 f1513aa..1cf5ca3 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 @@ -153,7 +153,7 @@ public class WorkOrderMQListener { try { JSONObject jsonObject = new JSONObject(); - jsonObject.put("code", "SMS_501816065"); + jsonObject.put("code", "SMS_503750025"); // jsonObject.put("name", workOrderMQDto.getFrontPath()); // jsonObject.put("username", workOrderMQDto.getAccountNo()); // jsonObject.put("password", workOrderMQDto.getPasswordText()); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java index 3011a4a..af1607c 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java @@ -15,11 +15,11 @@ public enum DySmsEnum { /**修改密码短信模板编码*/ 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"); /** * 短信模板编码 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java b/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java index 97a73b6..293a846 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java @@ -107,6 +107,7 @@ public class DataSourceLoader { DataSource newDs = dataSourceCreator.createDataSource(prop); ds.addDataSource(code, newDs); // 如果已存在，会先 close 旧的再替换（DynamicRoutingDataSource 内部逻辑） log.info("已添加/更新动态数据源: {}", code); + log.info("已添加/更新动态数据源url: {}", config.getDbUrl()); } catch (Exception e) { log.error("创建/更新数据源失败，code={}", code, e); } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index 413de38..2f56d6f 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -301,4 +301,6 @@ public class ElderInfoMQDto implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checkinTime; + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java b/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java index 64ed094..e5646e3 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java @@ -66,6 +66,10 @@ public class SuppliersMaterialInfoDto implements Serializable { @Excel(name = "品牌型号", width = 15) @ApiModelProperty(value = "品牌型号") private String brandType; + /**生产厂家*/ + @Excel(name = "生产厂家", width = 15) + @ApiModelProperty(value = "生产厂家") + private String manufacturer; /**销售单价*/ @Excel(name = "销售单价", width = 15) @ApiModelProperty(value = "销售单价") diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java index a62832d..7cc460a 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java @@ -309,5 +309,7 @@ public class ElderInfoEntity implements Serializable { private String jfztName; private String modifyStatus; private String auditContent; + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java index 4b766e8..b9a7972 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java @@ -1,5 +1,6 @@ package com.nu.entity; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.io.Serializable; @@ -69,6 +70,8 @@ public class NuBizAdvisoryInfoEntity implements Serializable { private String izJg; //是否是机构 0否 1是 private String izGys; + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index d862e25..6c4b938 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -385,5 +385,7 @@ public class ElderInfo implements Serializable { */ @TableField(exist = false) private String jfztName; + private String headPath;//长者头像 + private String guardianHeadPath;//监护人头像 } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index d916969..c45b8dd 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -101,7 +101,8 @@ public class ElderInfoServiceImpl extends ServiceImpl