Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer
This commit is contained in:
commit
3401798611
|
|
@ -128,5 +128,9 @@ public class AdvisoryInfo implements Serializable {
|
||||||
private String statusName;
|
private String statusName;
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String token;
|
private String token;
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String headPath;//长者头像
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String guardianHeadPath;//监护人头像
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,10 @@ public class NuBizAllMaterialInfo implements Serializable {
|
||||||
@Excel(name = "品牌型号", width = 15)
|
@Excel(name = "品牌型号", width = 15)
|
||||||
@ApiModelProperty(value = "品牌型号")
|
@ApiModelProperty(value = "品牌型号")
|
||||||
private java.lang.String brandType;
|
private java.lang.String brandType;
|
||||||
|
/**生产厂家*/
|
||||||
|
@Excel(name = "生产厂家", width = 15)
|
||||||
|
@ApiModelProperty(value = "生产厂家")
|
||||||
|
private java.lang.String manufacturer;
|
||||||
/**销售单价*/
|
/**销售单价*/
|
||||||
@Excel(name = "销售单价", width = 15)
|
@Excel(name = "销售单价", width = 15)
|
||||||
@ApiModelProperty(value = "销售单价")
|
@ApiModelProperty(value = "销售单价")
|
||||||
|
|
|
||||||
|
|
@ -99,18 +99,24 @@ public class NuBizAllMaterialInfoServiceImpl extends ServiceImpl<NuBizAllMateria
|
||||||
unlockedStyleRed.setFont(redFont);
|
unlockedStyleRed.setFont(redFont);
|
||||||
|
|
||||||
// 6. 创建大标题行(第1行)
|
// 6. 创建大标题行(第1行)
|
||||||
Row titleRow = sheet.createRow(0);
|
Row titleOneRow = sheet.createRow(0);
|
||||||
|
Cell materialTitleCellRow = titleOneRow.createCell(0);
|
||||||
|
materialTitleCellRow.setCellValue("供应商物料列表");
|
||||||
|
materialTitleCellRow.setCellStyle(lockedStyle);
|
||||||
|
sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6)); // 合并 B1:G1
|
||||||
|
|
||||||
|
Row titleRow = sheet.createRow(1);
|
||||||
Cell materialTitleCell = titleRow.createCell(0);
|
Cell materialTitleCell = titleRow.createCell(0);
|
||||||
materialTitleCell.setCellValue("供应商名称:");
|
materialTitleCell.setCellValue("供应商名称:");
|
||||||
materialTitleCell.setCellStyle(lockedStyle);
|
materialTitleCell.setCellStyle(lockedStyle);
|
||||||
Cell materialTitleCell2 = titleRow.createCell(1);
|
Cell materialTitleCell2 = titleRow.createCell(1);
|
||||||
materialTitleCell2.setCellValue("请填写供应商名称");
|
materialTitleCell2.setCellValue("请填写供应商名称");
|
||||||
materialTitleCell2.setCellStyle(unlockedStyleRed);
|
materialTitleCell2.setCellStyle(unlockedStyleRed);
|
||||||
sheet.addMergedRegion(new CellRangeAddress(0, 0, 1, 5)); // 合并 B1:G1
|
sheet.addMergedRegion(new CellRangeAddress(1, 1, 1, 5)); // 合并 B1:G1
|
||||||
|
|
||||||
// 7. 创建列名行(第2行)
|
// 7. 创建列名行(第2行)
|
||||||
Row headerRow = sheet.createRow(1);
|
Row headerRow = sheet.createRow(2);
|
||||||
String[] headers = { "是否提供", "货品名称", "规格型号", "品牌型号", "销售单价", "销售单位"};
|
String[] headers = { "是否提供", "货品名称", "规格型号", "品牌型号", "生产厂家", "销售单价", "销售单位"};
|
||||||
for (int i = 0; i < headers.length; i++) {
|
for (int i = 0; i < headers.length; i++) {
|
||||||
Cell cell = headerRow.createCell(i);
|
Cell cell = headerRow.createCell(i);
|
||||||
cell.setCellValue(headers[i]);
|
cell.setCellValue(headers[i]);
|
||||||
|
|
@ -118,25 +124,26 @@ public class NuBizAllMaterialInfoServiceImpl extends ServiceImpl<NuBizAllMateria
|
||||||
}
|
}
|
||||||
|
|
||||||
// 8. 填充数据(从第3行开始)
|
// 8. 填充数据(从第3行开始)
|
||||||
int rowNum = 2;
|
int rowNum = 3;
|
||||||
for (NuBizAllMaterialInfo info : dataList) {
|
for (NuBizAllMaterialInfo info : dataList) {
|
||||||
Row row = sheet.createRow(rowNum++);
|
Row row = sheet.createRow(rowNum++);
|
||||||
|
|
||||||
// 第1列:供应商名称 - 不可编辑
|
// 第1列:是否提供 - 可编辑
|
||||||
setCellValueWithStyle(row, 0, info.getIsSftg(), unlockedStyle);
|
setCellValueWithStyle(row, 0, info.getIsSftg(), unlockedStyle);
|
||||||
// 第2-4列:货品名称、规格型号、品牌型号 - 不可编辑
|
// 第2-4列:货品名称、规格型号、品牌型号、生产涨价 - 不可编辑
|
||||||
setCellValueWithStyle(row, 1, info.getMaterialName(), lockedStyle);
|
setCellValueWithStyle(row, 1, info.getMaterialName(), lockedStyle);
|
||||||
setCellValueWithStyle(row, 2, info.getSpecificationModel(), lockedStyle);
|
setCellValueWithStyle(row, 2, info.getSpecificationModel(), lockedStyle);
|
||||||
setCellValueWithStyle(row, 3, info.getBrandType(), lockedStyle);
|
setCellValueWithStyle(row, 3, info.getBrandType(), lockedStyle);
|
||||||
|
setCellValueWithStyle(row, 4, info.getManufacturer(), lockedStyle);
|
||||||
// 第5-6列:销售单价、销售单位 - 可编辑
|
// 第5-6列:销售单价、销售单位 - 可编辑
|
||||||
setCellValueWithStyle(row, 4, info.getSalesUnitPrice(), unlockedStyle);
|
setCellValueWithStyle(row, 5, info.getSalesUnitPrice(), unlockedStyle);
|
||||||
setCellValueWithStyle(row, 5, info.getSalesUnit(), unlockedStyle);
|
setCellValueWithStyle(row, 6, info.getSalesUnit(), unlockedStyle);
|
||||||
// 第7列:是否提供 - 可编辑
|
// 第7列:是否提供 - 可编辑
|
||||||
// setCellValueWithStyle(row, 6, info.getIsSftg(), unlockedStyle);
|
// setCellValueWithStyle(row, 6, info.getIsSftg(), unlockedStyle);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 9. 设置列宽
|
// 9. 设置列宽
|
||||||
int[] colWidths = {5000, 10000, 10000, 10000, 5000, 5000};
|
int[] colWidths = {5000, 10000, 7000, 7000,10000, 5000, 5000};
|
||||||
for (int i = 0; i < colWidths.length; i++) {
|
for (int i = 0; i < colWidths.length; i++) {
|
||||||
sheet.setColumnWidth(i, colWidths[i]);
|
sheet.setColumnWidth(i, colWidths[i]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
*/
|
*/
|
||||||
public interface NuBizSuppliersOrgMapper extends BaseMapper<NuBizSuppliersOrg> {
|
public interface NuBizSuppliersOrgMapper extends BaseMapper<NuBizSuppliersOrg> {
|
||||||
|
|
||||||
|
List<NuBizSuppliersOrg> groupBySuppInfo(@Param("suppliersId") String suppliersId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = '入驻'
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,7 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.nu.modules.bizSuppliers.mapper.NuBizSuppliersOrgMapper">
|
<mapper namespace="com.nu.modules.bizSuppliers.mapper.NuBizSuppliersOrgMapper">
|
||||||
|
|
||||||
|
<select id="groupBySuppInfo" resultType="com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg">
|
||||||
|
select org_code from nu_biz_suppliers_org where suppliers_id = #{suppliersId} GROUP BY org_code
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -3,6 +3,8 @@ package com.nu.modules.bizSuppliers.service;
|
||||||
import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg;
|
import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 供应商-机构中间表
|
* @Description: 供应商-机构中间表
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
|
|
@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
*/
|
*/
|
||||||
public interface INuBizSuppliersOrgService extends IService<NuBizSuppliersOrg> {
|
public interface INuBizSuppliersOrgService extends IService<NuBizSuppliersOrg> {
|
||||||
|
|
||||||
|
List<NuBizSuppliersOrg> groupBySuppInfo(String suppliersId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
@ -290,6 +292,16 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
|
||||||
nuBizSuppliersMaterialInfo.setSalesUnit(suppliersMaterialInfoDto.getSalesUnit());
|
nuBizSuppliersMaterialInfo.setSalesUnit(suppliersMaterialInfoDto.getSalesUnit());
|
||||||
nuBizSuppliersMaterialInfo.setSalesUnitPrice(suppliersMaterialInfoDto.getSalesUnitPrice());
|
nuBizSuppliersMaterialInfo.setSalesUnitPrice(suppliersMaterialInfoDto.getSalesUnitPrice());
|
||||||
nuBizSuppliersMaterialInfoMapper.updateById(nuBizSuppliersMaterialInfo);
|
nuBizSuppliersMaterialInfoMapper.updateById(nuBizSuppliersMaterialInfo);
|
||||||
|
//修改对应机构的数据
|
||||||
|
List<NuBizSuppliersOrg> 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;
|
return suppliersMaterialInfoDto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -319,6 +331,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 +360,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);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -363,7 +378,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
|
||||||
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
|
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
|
||||||
nuWxNotice.setOpenId(one.getOpenId());
|
nuWxNotice.setOpenId(one.getOpenId());
|
||||||
nuWxNotice.setIzRead("N");
|
nuWxNotice.setIzRead("N");
|
||||||
nuWxNotice.setTitle("入驻机构审批");
|
nuWxNotice.setTitle("供应商入驻审核");
|
||||||
nuWxNotice.setContent(content1);
|
nuWxNotice.setContent(content1);
|
||||||
nuWxNotice.setType("suppliers_status");
|
nuWxNotice.setType("suppliers_status");
|
||||||
Map<String, Object> extend = Maps.newHashMap();
|
Map<String, Object> extend = Maps.newHashMap();
|
||||||
|
|
@ -572,6 +587,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 = "";
|
||||||
|
|
@ -581,10 +599,10 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
|
||||||
// SysDepart dto = sysDepartService.getOne(queryWrapper);
|
// SysDepart dto = sysDepartService.getOne(queryWrapper);
|
||||||
//审核通过
|
//审核通过
|
||||||
if (StringUtils.equals("modifyPass", nuBizSuppliersApply.getStatus())) {
|
if (StringUtils.equals("modifyPass", nuBizSuppliersApply.getStatus())) {
|
||||||
content1 = "您好,您提交的信息变更已通过";
|
content1 = "您好,您提交的"+one.getSuppliersName()+"信息变更已通过";
|
||||||
content2 = "审核通过";
|
content2 = "审核通过";
|
||||||
} else if (StringUtils.equals("modifyFail", nuBizSuppliersApply.getStatus())) {
|
} else if (StringUtils.equals("modifyFail", nuBizSuppliersApply.getStatus())) {
|
||||||
content1 = "您好,您提交的信息变更未通过,驳回原因:"+nuBizSuppliersApply.getApplyContent();
|
content1 = "您好,您提交的"+one.getSuppliersName()+"信息变更未通过,驳回原因:"+nuBizSuppliersApply.getApplyContent();
|
||||||
content2 = "审核未通过";
|
content2 = "审核未通过";
|
||||||
}
|
}
|
||||||
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
|
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 供应商-机构中间表
|
* @Description: 供应商-机构中间表
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
|
|
@ -16,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
@Service
|
@Service
|
||||||
public class NuBizSuppliersOrgServiceImpl extends ServiceImpl<NuBizSuppliersOrgMapper, NuBizSuppliersOrg> implements INuBizSuppliersOrgService {
|
public class NuBizSuppliersOrgServiceImpl extends ServiceImpl<NuBizSuppliersOrgMapper, NuBizSuppliersOrg> implements INuBizSuppliersOrgService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<NuBizSuppliersOrg> groupBySuppInfo(String suppliersId) {
|
||||||
|
return baseMapper.groupBySuppInfo(suppliersId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
|
||||||
|
|
||||||
EmployeesOrg emAdd = new EmployeesOrg();
|
EmployeesOrg emAdd = new EmployeesOrg();
|
||||||
BeanUtils.copyProperties(dto, emAdd);
|
BeanUtils.copyProperties(dto, emAdd);
|
||||||
|
emAdd.setCreateTime(new Date());
|
||||||
emAdd.setId(null);
|
emAdd.setId(null);
|
||||||
emAdd.setEmployeesId(dto.getId());
|
emAdd.setEmployeesId(dto.getId());
|
||||||
emAdd.setIzHistory("N");
|
emAdd.setIzHistory("N");
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@ public class OrgApplyInfoController extends JeecgController<OrgApplyInfo, IOrgAp
|
||||||
String value = orgApplyInfo.getTitle();
|
String value = orgApplyInfo.getTitle();
|
||||||
queryWrapper.and(c -> c.like("com_name", value).or().like("org_leader", value).or().like("org_leader_phone", value));
|
queryWrapper.and(c -> 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<OrgApplyInfo> pageList = orgApplyInfoService.page(page, queryWrapper);
|
IPage<OrgApplyInfo> pageList = orgApplyInfoService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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());
|
||||||
|
|
|
||||||
|
|
@ -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");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 短信模板编码
|
* 短信模板编码
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,7 @@ public class DataSourceLoader {
|
||||||
DataSource newDs = dataSourceCreator.createDataSource(prop);
|
DataSource newDs = dataSourceCreator.createDataSource(prop);
|
||||||
ds.addDataSource(code, newDs); // 如果已存在,会先 close 旧的再替换(DynamicRoutingDataSource 内部逻辑)
|
ds.addDataSource(code, newDs); // 如果已存在,会先 close 旧的再替换(DynamicRoutingDataSource 内部逻辑)
|
||||||
log.info("已添加/更新动态数据源: {}", code);
|
log.info("已添加/更新动态数据源: {}", code);
|
||||||
|
log.info("已添加/更新动态数据源url: {}", config.getDbUrl());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("创建/更新数据源失败,code={}", code, e);
|
log.error("创建/更新数据源失败,code={}", code, e);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -301,4 +301,6 @@ public class ElderInfoMQDto implements Serializable {
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date checkinTime;
|
private Date checkinTime;
|
||||||
|
|
||||||
|
private String headPath;//长者头像
|
||||||
|
private String guardianHeadPath;//监护人头像
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,10 @@ public class SuppliersMaterialInfoDto implements Serializable {
|
||||||
@Excel(name = "品牌型号", width = 15)
|
@Excel(name = "品牌型号", width = 15)
|
||||||
@ApiModelProperty(value = "品牌型号")
|
@ApiModelProperty(value = "品牌型号")
|
||||||
private String brandType;
|
private String brandType;
|
||||||
|
/**生产厂家*/
|
||||||
|
@Excel(name = "生产厂家", width = 15)
|
||||||
|
@ApiModelProperty(value = "生产厂家")
|
||||||
|
private String manufacturer;
|
||||||
/**销售单价*/
|
/**销售单价*/
|
||||||
@Excel(name = "销售单价", width = 15)
|
@Excel(name = "销售单价", width = 15)
|
||||||
@ApiModelProperty(value = "销售单价")
|
@ApiModelProperty(value = "销售单价")
|
||||||
|
|
|
||||||
|
|
@ -309,5 +309,7 @@ public class ElderInfoEntity implements Serializable {
|
||||||
private String jfztName;
|
private String jfztName;
|
||||||
private String modifyStatus;
|
private String modifyStatus;
|
||||||
private String auditContent;
|
private String auditContent;
|
||||||
|
private String headPath;//长者头像
|
||||||
|
private String guardianHeadPath;//监护人头像
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package com.nu.entity;
|
package com.nu.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
@ -69,6 +70,8 @@ public class NuBizAdvisoryInfoEntity implements Serializable {
|
||||||
private String izJg;
|
private String izJg;
|
||||||
//是否是机构 0否 1是
|
//是否是机构 0否 1是
|
||||||
private String izGys;
|
private String izGys;
|
||||||
|
private String headPath;//长者头像
|
||||||
|
private String guardianHeadPath;//监护人头像
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -385,5 +385,7 @@ public class ElderInfo implements Serializable {
|
||||||
*/
|
*/
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String jfztName;
|
private String jfztName;
|
||||||
|
private String headPath;//长者头像
|
||||||
|
private String guardianHeadPath;//监护人头像
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,8 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
|
||||||
Objects.equals(dbRecord.getStartTime(), inputRecord.getStartTime()) &&
|
Objects.equals(dbRecord.getStartTime(), inputRecord.getStartTime()) &&
|
||||||
Objects.equals(dbRecord.getEndTime(), inputRecord.getEndTime()) &&
|
Objects.equals(dbRecord.getEndTime(), inputRecord.getEndTime()) &&
|
||||||
Objects.equals(dbRecord.getDisabilityReimbursementType(), inputRecord.getDisabilityReimbursementType()) &&
|
Objects.equals(dbRecord.getDisabilityReimbursementType(), inputRecord.getDisabilityReimbursementType()) &&
|
||||||
Objects.equals(dbRecord.getMedicalType(), inputRecord.getMedicalType())
|
Objects.equals(dbRecord.getMedicalType(), inputRecord.getMedicalType())&&
|
||||||
|
Objects.equals(dbRecord.getHeadPath(), inputRecord.getHeadPath())
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return !(
|
return !(
|
||||||
|
|
@ -110,7 +111,8 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
|
||||||
Objects.equals(dbRecord.getGuardianPhone(), inputRecord.getGuardianPhone()) &&
|
Objects.equals(dbRecord.getGuardianPhone(), inputRecord.getGuardianPhone()) &&
|
||||||
Objects.equals(dbRecord.getGuardianHomeAddress(), inputRecord.getGuardianHomeAddress()) &&
|
Objects.equals(dbRecord.getGuardianHomeAddress(), inputRecord.getGuardianHomeAddress()) &&
|
||||||
Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit()) &&
|
Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit()) &&
|
||||||
Objects.equals(dbRecord.getGuardianIdCardPositive(), inputRecord.getGuardianIdCardPositive())
|
Objects.equals(dbRecord.getGuardianIdCardPositive(), inputRecord.getGuardianIdCardPositive())&&
|
||||||
|
Objects.equals(dbRecord.getGuardianHeadPath(), inputRecord.getGuardianHeadPath())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// if("jhr".equals(elderInfoEntity.getModifyType())){
|
// if("jhr".equals(elderInfoEntity.getModifyType())){
|
||||||
|
|
|
||||||
|
|
@ -149,6 +149,7 @@ public class ConfigMaterialInfo implements Serializable {
|
||||||
private String pinyin;
|
private String pinyin;
|
||||||
|
|
||||||
private String brandType;
|
private String brandType;
|
||||||
|
private String manufacturer;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String treeId;//树id,用于查询
|
private String treeId;//树id,用于查询
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,8 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
|
||||||
// 创建唯一键
|
// 创建唯一键
|
||||||
String uniqueKey = config.getMaterialName() + "|" +
|
String uniqueKey = config.getMaterialName() + "|" +
|
||||||
config.getSpecificationModel() + "|" +
|
config.getSpecificationModel() + "|" +
|
||||||
config.getBrandType();
|
config.getBrandType() + "|" +
|
||||||
|
config.getManufacturer();
|
||||||
|
|
||||||
// 去重
|
// 去重
|
||||||
if (!uniqueKeys.contains(uniqueKey)) {
|
if (!uniqueKeys.contains(uniqueKey)) {
|
||||||
|
|
@ -76,6 +77,7 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
|
||||||
lsbl.setMaterialName(config.getMaterialName());
|
lsbl.setMaterialName(config.getMaterialName());
|
||||||
lsbl.setSpecificationModel(config.getSpecificationModel());
|
lsbl.setSpecificationModel(config.getSpecificationModel());
|
||||||
lsbl.setBrandType(config.getBrandType());
|
lsbl.setBrandType(config.getBrandType());
|
||||||
|
lsbl.setManufacturer(config.getManufacturer());
|
||||||
distinctList.add(lsbl);
|
distinctList.add(lsbl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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文件上传
|
||||||
|
|
|
||||||
|
|
@ -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文件上传
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue