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

Compare commits

base: bonus:770c30e06973f421405ead06473bf27090a65ff4
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528
..
compare: bonus:602c04b0f68fa42699e72d3e85a20747554a03af
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528

No commits in common. "770c30e06973f421405ead06473bf27090a65ff4" and "602c04b0f68fa42699e72d3e85a20747554a03af" have entirely different histories.
770c30e069 ... 602c04b0f6

2 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java
View File

@ -53,12 +53,12 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonInfo.getArticleTitle()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonInfo.getArticleTitle());
healthPersonInfo.setEncryptedSearchValue(encryptedSearchValue); healthPersonInfo.setEncryptedSearchValue(encryptedSearchValue);
List<HealthPersonInfo> list=healthPersonInfoMapper.selectHealthPersonInfoList(healthPersonInfo); List<HealthPersonInfo> list=healthPersonInfoMapper.selectHealthPersonInfoList(healthPersonInfo);
// if(CollUtil.isNotEmpty(list)) { if(CollUtil.isNotEmpty(list)) {
// for(HealthPersonInfo vo : list) { for(HealthPersonInfo vo : list) {
// vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile())); vo.setMobile(SM4EncryptUtils.sm4Decrypt(vo.getMobile()));
// vo.setMobile(maskPhoneNumber(vo.getMobile())); vo.setMobile(maskPhoneNumber(vo.getMobile()));
// } }
// } }
return list; return list;
} }
public static String maskPhoneNumber(String phoneNumber) { public static String maskPhoneNumber(String phoneNumber) {

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml
View File

@ -52,7 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterImgUrl != null and enterImgUrl != ''"> and kseer.enter_img_url = #{enterImgUrl}</if> <if test="enterImgUrl != null and enterImgUrl != ''"> and kseer.enter_img_url = #{enterImgUrl}</if>
<if test="startDate != null "> and substring(kseer.enter_time,1,10) >= #{startDate} and #{endDate}>= substring(kseer.enter_time,1,10)</if> <if test="startDate != null "> and substring(kseer.enter_time,1,10) >= #{startDate} and #{endDate}>= substring(kseer.enter_time,1,10)</if>
</where> </where>
order by kseer.enter_time desc
</select> </select>
<select id="selectKitchenStaffEnterExitRecordByCheckId" parameterType="Long" resultMap="KitchenStaffEnterExitRecordResult"> <select id="selectKitchenStaffEnterExitRecordByCheckId" parameterType="Long" resultMap="KitchenStaffEnterExitRecordResult">