bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

替换 mgr_role_canteen 表为 sys_role_canteen 

替换 mgr_role_warehouse 表为 sys_role_warehouse
This commit is contained in:
gaowdong 2025-03-14 14:14:14 +08:00
parent 41fb46a8ca
commit 4e280b7b6d
4 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthBodyRecordPageVO.java
View File

@ -37,8 +37,8 @@ public class HealthBodyRecordPageVO {
@ApiModelProperty("手机号") @ApiModelProperty("手机号")
@LeNiuDecryptField(HandleType.DESENSITIZE_MOBILE_PHONE) @LeNiuDecryptField(HandleType.DESENSITIZE_MOBILE_PHONE)
private String mobile; private String mobile;
@ApiModelProperty("所属组织") // @ApiModelProperty("所属组织")
private String orgFullName; // private String orgFullName;
@ApiModelProperty("健康信息录入来源 1-系统录入 2-身高体重秤") @ApiModelProperty("健康信息录入来源 1-系统录入 2-身高体重秤")
private Integer healthInfoSource; private Integer healthInfoSource;
@ApiModelProperty("性别 1-男 2-女") @ApiModelProperty("性别 1-男 2-女")
@ -92,9 +92,9 @@ public class HealthBodyRecordPageVO {
return this.mobile; return this.mobile;
} }
public String getOrgFullName() { // public String getOrgFullName() {
return this.orgFullName; // return this.orgFullName;
} // }
public Integer getHealthInfoSource() { public Integer getHealthInfoSource() {
return this.healthInfoSource; return this.healthInfoSource;
@ -152,9 +152,9 @@ public class HealthBodyRecordPageVO {
this.mobile = mobile; this.mobile = mobile;
} }
public void setOrgFullName(final String orgFullName) { // public void setOrgFullName(final String orgFullName) {
this.orgFullName = orgFullName; // this.orgFullName = orgFullName;
} // }
public void setHealthInfoSource(final Integer healthInfoSource) { public void setHealthInfoSource(final Integer healthInfoSource) {
this.healthInfoSource = healthInfoSource; this.healthInfoSource = healthInfoSource;
@ -166,6 +166,6 @@ public class HealthBodyRecordPageVO {
public String toString() { public String toString() {
String var10000 = String.valueOf(this.getRegisterDate()); String var10000 = String.valueOf(this.getRegisterDate());
return "HealthBodyRecordPageVO(registerDate=" + var10000 + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", custNum=" + this.getCustNum() + ", custId=" + this.getCustId() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", orgFullName=" + this.getOrgFullName() + ", healthInfoSource=" + this.getHealthInfoSource() + ", sex=" + this.getSex() + ")"; return "HealthBodyRecordPageVO(registerDate=" + var10000 + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", custNum=" + this.getCustNum() + ", custId=" + this.getCustId() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", healthInfoSource=" + this.getHealthInfoSource() + ", sex=" + this.getSex() + ")";
} }
} }

56
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthInfoFullVo.java
View File

@ -29,16 +29,16 @@ public class HealthInfoFullVo {
private Integer age; private Integer age;
@ApiModelProperty("所属组织id") @ApiModelProperty("所属组织id")
private Long orgId; private Long orgId;
@ApiModelProperty("所属组织名称") // @ApiModelProperty("所属组织名称")
private String orgFullName; // private String orgFullName;
@ApiModelProperty("人员类别") @ApiModelProperty("人员类别")
private Integer psnType; private Integer psnType;
@ApiModelProperty("人员类别名称") @ApiModelProperty("人员类别名称")
private String psnTypeName; private String psnTypeName;
@ApiModelProperty("所属位置Id") // @ApiModelProperty("所属位置Id")
private Long placeId; // private Long placeId;
@ApiModelProperty("所属位置") // @ApiModelProperty("所属位置")
private String placeFullName; // private String placeFullName;
@ApiModelProperty("生日") @ApiModelProperty("生日")
private LocalDate birthday; private LocalDate birthday;
@ApiModelProperty("血型") @ApiModelProperty("血型")
@ -144,9 +144,9 @@ public class HealthInfoFullVo {
return this.orgId; return this.orgId;
} }
public String getOrgFullName() { // public String getOrgFullName() {
return this.orgFullName; // return this.orgFullName;
} // }
public Integer getPsnType() { public Integer getPsnType() {
return this.psnType; return this.psnType;
@ -156,13 +156,13 @@ public class HealthInfoFullVo {
return this.psnTypeName; return this.psnTypeName;
} }
public Long getPlaceId() { // public Long getPlaceId() {
return this.placeId; // return this.placeId;
} // }
public String getPlaceFullName() { // public String getPlaceFullName() {
return this.placeFullName; // return this.placeFullName;
} // }
public LocalDate getBirthday() { public LocalDate getBirthday() {
return this.birthday; return this.birthday;
@ -340,9 +340,9 @@ public class HealthInfoFullVo {
this.orgId = orgId; this.orgId = orgId;
} }
public void setOrgFullName(final String orgFullName) { // public void setOrgFullName(final String orgFullName) {
this.orgFullName = orgFullName; // this.orgFullName = orgFullName;
} // }
public void setPsnType(final Integer psnType) { public void setPsnType(final Integer psnType) {
this.psnType = psnType; this.psnType = psnType;
@ -352,13 +352,13 @@ public class HealthInfoFullVo {
this.psnTypeName = psnTypeName; this.psnTypeName = psnTypeName;
} }
public void setPlaceId(final Long placeId) { // public void setPlaceId(final Long placeId) {
this.placeId = placeId; // this.placeId = placeId;
} // }
public void setPlaceFullName(final String placeFullName) { // public void setPlaceFullName(final String placeFullName) {
this.placeFullName = placeFullName; // this.placeFullName = placeFullName;
} // }
public void setBirthday(final LocalDate birthday) { public void setBirthday(final LocalDate birthday) {
this.birthday = birthday; this.birthday = birthday;
@ -506,7 +506,7 @@ public class HealthInfoFullVo {
public String toString() { public String toString() {
Long var10000 = this.getId(); Long var10000 = this.getId();
return "HealthInfoFullVo(id=" + var10000 + ", custId=" + this.getCustId() + ", custNum=" + this.getCustNum() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", sex=" + this.getSex() + ", age=" + this.getAge() + ", orgId=" + this.getOrgId() + ", orgFullName=" + this.getOrgFullName() + ", psnType=" + this.getPsnType() + ", psnTypeName=" + this.getPsnTypeName() + ", placeId=" + this.getPlaceId() + ", placeFullName=" + this.getPlaceFullName() + ", birthday=" + String.valueOf(this.getBirthday()) + ", bloodType=" + this.getBloodType() + ", maritalStatus=" + this.getMaritalStatus() + ", pregnantStatus=" + this.getPregnantStatus() + ", pregnancyDate=" + String.valueOf(this.getPregnancyDate()) + ", chronicIds=" + this.getChronicIds() + ", chronicNames=" + this.getChronicNames() + ", doctorAdvice=" + this.getDoctorAdvice() + ", ifHospitalized=" + this.getIfHospitalized() + ", doctorNum=" + this.getDoctorNum() + ", hospitalNum=" + this.getHospitalNum() + ", inpatientDate=" + String.valueOf(this.getInpatientDate()) + ", inpatientResult=" + this.getInpatientResult() + ", weightControl=" + this.getWeightControl() + ", allergen=" + this.getAllergen() + ", labourIntensity=" + this.getLabourIntensity() + ", healthState=" + this.getHealthState() + ", ifDel=" + this.getIfDel() + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bust=" + String.valueOf(this.getBust()) + ", waistline=" + String.valueOf(this.getWaistline()) + ", bloodSugar=" + String.valueOf(this.getBloodSugar()) + ", bloodFat=" + this.getBloodFat() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", bloodOxygen=" + String.valueOf(this.getBloodOxygen()) + ", uricAcid=" + this.getUricAcid() + ", bloodPressure=" + this.getBloodPressure() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; return "HealthInfoFullVo(id=" + var10000 + ", custId=" + this.getCustId() + ", custNum=" + this.getCustNum() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", sex=" + this.getSex() + ", age=" + this.getAge() + ", orgId=" + this.getOrgId() + ", psnType=" + this.getPsnType() + ", psnTypeName=" + this.getPsnTypeName() + ", birthday=" + String.valueOf(this.getBirthday()) + ", bloodType=" + this.getBloodType() + ", maritalStatus=" + this.getMaritalStatus() + ", pregnantStatus=" + this.getPregnantStatus() + ", pregnancyDate=" + String.valueOf(this.getPregnancyDate()) + ", chronicIds=" + this.getChronicIds() + ", chronicNames=" + this.getChronicNames() + ", doctorAdvice=" + this.getDoctorAdvice() + ", ifHospitalized=" + this.getIfHospitalized() + ", doctorNum=" + this.getDoctorNum() + ", hospitalNum=" + this.getHospitalNum() + ", inpatientDate=" + String.valueOf(this.getInpatientDate()) + ", inpatientResult=" + this.getInpatientResult() + ", weightControl=" + this.getWeightControl() + ", allergen=" + this.getAllergen() + ", labourIntensity=" + this.getLabourIntensity() + ", healthState=" + this.getHealthState() + ", ifDel=" + this.getIfDel() + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bust=" + String.valueOf(this.getBust()) + ", waistline=" + String.valueOf(this.getWaistline()) + ", bloodSugar=" + String.valueOf(this.getBloodSugar()) + ", bloodFat=" + this.getBloodFat() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", bloodOxygen=" + String.valueOf(this.getBloodOxygen()) + ", uricAcid=" + this.getUricAcid() + ", bloodPressure=" + this.getBloodPressure() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")";
} }
public HealthInfoFullVo() { public HealthInfoFullVo() {
@ -521,11 +521,11 @@ public class HealthInfoFullVo {
this.sex = sex; this.sex = sex;
this.age = age; this.age = age;
this.orgId = orgId; this.orgId = orgId;
this.orgFullName = orgFullName; // this.orgFullName = orgFullName;
this.psnType = psnType; this.psnType = psnType;
this.psnTypeName = psnTypeName; this.psnTypeName = psnTypeName;
this.placeId = placeId; // this.placeId = placeId;
this.placeFullName = placeFullName; // this.placeFullName = placeFullName;
this.birthday = birthday; this.birthday = birthday;
this.bloodType = bloodType; this.bloodType = bloodType;
this.maritalStatus = maritalStatus; this.maritalStatus = maritalStatus;

36
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml
View File

@ -16,15 +16,15 @@
h.heart_rate, h.heart_rate,
c.cust_num, c.cust_num,
h.cust_id, h.cust_id,
c.cust_name, c.nick_name as cust_name,
c.mobile, c.phonenumber as mobile,
co.org_full_name, # co.org_full_name,
h.health_info_source, h.health_info_source,
c.sex c.sex
FROM FROM
health_body_record h health_body_record h
LEFT JOIN cust_info c ON c.cust_id = h.cust_id LEFT JOIN sys_user c ON c.cust_id = h.cust_id
LEFT JOIN cust_org co ON c.org_id = co.org_id LEFT JOIN sys_dept co ON c.dept_id = co.dept_id
WHERE 1=1 WHERE 1=1
<if test="param.healthInfoSource != null"> <if test="param.healthInfoSource != null">
AND h.health_info_source = #{param.healthInfoSource} AND h.health_info_source = #{param.healthInfoSource}
@ -35,16 +35,16 @@
<if test="param.keyword != null and param.keyword != ''"> <if test="param.keyword != null and param.keyword != ''">
AND ( AND (
c.cust_num = #{param.keyword} c.cust_num = #{param.keyword}
OR c.cust_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR c.mobile = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
or c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} # or c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
) )
</if> </if>
<if test="param.queryDate != null"> <if test="param.queryDate != null">
<![CDATA[AND date_format( h.crtime, '%Y-%m' ) = date_format(#{param.queryDate},'%Y-%m')]]> <![CDATA[AND date_format( h.crtime, '%Y-%m' ) = date_format(#{param.queryDate},'%Y-%m')]]>
</if> </if>
<if test="param.orgIdList != null and param.orgIdList.size() > 0"> <if test="param.orgIdList != null and param.orgIdList.size() > 0">
AND c.org_id IN AND c.dept_id IN
<foreach collection="param.orgIdList" item="orgId" separator="," open="(" <foreach collection="param.orgIdList" item="orgId" separator="," open="("
close=")"> close=")">
#{orgId} #{orgId}
@ -68,15 +68,15 @@
h.heart_rate, h.heart_rate,
c.cust_num, c.cust_num,
h.cust_id, h.cust_id,
c.cust_name, c.nick_name as cust_name,
c.mobile, c.phonenumber as mobile,
co.org_full_name, # co.org_full_name,
h.health_info_source, h.health_info_source,
c.sex c.sex
FROM FROM
health_body_record h health_body_record h
LEFT JOIN cust_info c ON c.cust_id = h.cust_id LEFT JOIN sys_user c ON c.cust_id = h.cust_id
LEFT JOIN cust_org co ON c.org_id = co.org_id LEFT JOIN sys_dept co ON c.dept_id = co.dept_id
WHERE 1=1 WHERE 1=1
<if test="param.healthInfoSource != null"> <if test="param.healthInfoSource != null">
AND h.health_info_source = #{param.healthInfoSource} AND h.health_info_source = #{param.healthInfoSource}
@ -87,16 +87,16 @@
<if test="param.keyword != null and param.keyword != ''"> <if test="param.keyword != null and param.keyword != ''">
AND ( AND (
c.cust_num = #{param.keyword} c.cust_num = #{param.keyword}
OR c.cust_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR c.mobile = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
OR c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} # OR c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler}
) )
</if> </if>
<if test="param.queryDate != null"> <if test="param.queryDate != null">
<![CDATA[AND TO_CHAR( h.crtime, 'yyyy-mm' ) = TO_CHAR(#{param.queryDate},'yyyy-mm')]]> <![CDATA[AND TO_CHAR( h.crtime, 'yyyy-mm' ) = TO_CHAR(#{param.queryDate},'yyyy-mm')]]>
</if> </if>
<if test="param.orgIdList != null and param.orgIdList.size() > 0"> <if test="param.orgIdList != null and param.orgIdList.size() > 0">
AND c.org_id IN AND c.dept_id IN
<foreach collection="param.orgIdList" item="orgId" separator="," open="(" <foreach collection="param.orgIdList" item="orgId" separator="," open="("
close=")"> close=")">
#{orgId} #{orgId}

28
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthInfoMapper.xml
View File

@ -50,15 +50,15 @@
<select id="fullHealthInfo" resultType="com.bonus.canteen.core.nutrition.common.vo.HealthInfoFullVo"> <select id="fullHealthInfo" resultType="com.bonus.canteen.core.nutrition.common.vo.HealthInfoFullVo">
select a.cust_id, select a.cust_id,
a.cust_num, a.cust_num,
a.cust_name, a.nick_name as cust_name,
a.mobile, a.phonenumber as mobile,
a.sex, a.sex,
a.org_id, a.dept_id as org_id,
a.org_full_name, # a.org_full_name,
a.psn_type, a.psn_type,
a.psn_type_name, a.psn_type_name,
a.place_id, # a.place_id,
cp.place_full_name, # cp.place_full_name,
a.birthday, a.birthday,
b.marital_status, b.marital_status,
b.pregnant_status, b.pregnant_status,
@ -90,23 +90,23 @@
c.blood_pressure, c.blood_pressure,
GROUP_CONCAT(d.chronic_name ORDER BY d.chronic_id desc) AS chronic_names, GROUP_CONCAT(d.chronic_name ORDER BY d.chronic_id desc) AS chronic_names,
GROUP_CONCAT(d.chronic_id ORDER BY d.chronic_id desc) AS chronic_ids GROUP_CONCAT(d.chronic_id ORDER BY d.chronic_id desc) AS chronic_ids
from cust_info a from sys_user a
left join cust_place cp on a.place_id = cp.place_id # left join cust_place cp on a.place_id = cp.place_id
left join health_info b on a.cust_id = b.cust_id left join health_info b on a.cust_id = b.cust_id
left join health_body_record c on a.cust_id = c.cust_id and c.if_latest = 1 left join health_body_record c on a.cust_id = c.cust_id and c.if_latest = 1
left join health_info_chronic d on a.cust_id = d.cust_id left join health_info_chronic d on a.cust_id = d.cust_id
where a.cust_id = #{custId} where a.cust_id = #{custId}
group by a.cust_id, group by a.cust_id,
a.cust_name, a.nick_name,
a.cust_num, a.cust_num,
a.mobile, a.phonenumber,
a.sex, a.sex,
a.org_id, a.dept_id,
a.org_full_name, # a.org_full_name,
a.psn_type, a.psn_type,
a.psn_type_name, a.psn_type_name,
a.place_id, # a.place_id,
cp.place_full_name, # cp.place_full_name,
a.birthday, a.birthday,
b.marital_status, b.marital_status,
b.pregnant_status, b.pregnant_status,