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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-07-07 08:30:41 +08:00
parent 80886a9b69 2a4a4a97c2
commit 908d743327
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenStaffEnterExitRecord.java
View File

@ -76,7 +76,7 @@ public class KitchenStaffEnterExitRecord extends BaseEntity {
@ApiModelProperty("食堂")
private String canteenId;
@ApiModelProperty("位置")
private String placeFullName;
private String subPlaceName;
@ApiModelProperty("门名称")
private String doorName;
@ApiModelProperty("进出方式")
@ -90,5 +90,7 @@ public class KitchenStaffEnterExitRecord extends BaseEntity {
private String articleTitle;
private String employeeNo;
private String subPlaceId;
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/NetSDK/FMSGCallBack_V31.java
View File

@ -92,7 +92,10 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
KitchenStaffEnterExitRecord vo=new KitchenStaffEnterExitRecord();
vo.setStaffId(user.getStaffId());
vo.setEnterTime(swipedata);
vo.setDeviceId(13L);
vo.setCreateTime(new Date());
vo.setInoutType("人脸");
vo.setInoutDirection("进入");
try{
kitchenStaffEnterExitRecordService.insertKitchenStaffEnterExitRecord(vo);
}catch (Exception e){

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/DataScreeningServiceImpl.java
View File

@ -130,14 +130,11 @@ public class DataScreeningServiceImpl implements DataScreeningService {
BigDecimal todayNum = Optional.ofNullable(today.getNum()).orElse(BigDecimal.ZERO);
if (yesterdayNum.compareTo(BigDecimal.ZERO) == 0) {
today.setRate(todayNum.compareTo(BigDecimal.ZERO) == 0 ? "0.0" : "100.0");
today.setRate(todayNum.compareTo(BigDecimal.ZERO) == 0 ? "0.0" : "∞");
} else {
BigDecimal rate = todayNum.subtract(yesterdayNum)
.divide(yesterdayNum, 4, RoundingMode.HALF_UP)
.multiply(BigDecimal.valueOf(100));
if (rate.compareTo(BigDecimal.valueOf(100)) > 0) {
rate = BigDecimal.valueOf(100);
}
today.setRate(String.format("%.2f", rate));
}

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

@ -29,10 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="inoutType" column="inout_type" />
<result property="inoutDirection" column="inout_direction" />
<result property="subPlaceName" column="sub_place_name" />
</resultMap>
<sql id="selectKitchenStaffEnterExitRecordVo">
select kseer.enter_time,kseer.exit_time,kseer.enter_img_url,kseer.exit_img_url,kseer.device_id,
select kseer.enter_time,de.area_id,de.sub_place,ksp.sub_place_name,de.device_name as doorname,
kseer.exit_time,kseer.enter_img_url,kseer.exit_img_url,kseer.device_id,kseer.inout_type,kseer.inout_direction,
kst.staff_id, kst.canteen_id, staff_no, staff_name, post_name, mobile, sex, kst.area_id, health_cert_expire,
health_cert_front_img, health_cert_back_img, nutrity_cert_expire,
safety_cert_expire, kst.create_by, kst.create_time, kst.update_by, kst.update_time,
@ -42,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join kitchen_staff_face ksf on kst.staff_id = ksf.staff_id
left join basic_canteen bc on kst.canteen_id = bc.canteen_id
left join basic_area ba on kst.area_id = ba.area_id
left join kitchen_device_info de on kseer.device_id=de.device_id
left join kitchen_sub_place ksp on de.sub_place=ksp.sub_place_id
</sql>
<select id="selectKitchenStaffEnterExitRecordList" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenStaffEnterExitRecord" resultMap="KitchenStaffEnterExitRecordResult">
@ -51,6 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="staffId != null "> and kseer.staff_id = #{staffId}</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="areaId != null and areaId != ''"> and kst.area_id = #{areaId}</if>
<if test="canteenId != null and canteenId != ''"> and kst.canteen_id = #{canteenId}</if>
<if test="subPlaceId != null and subPlaceId != ''"> and de.sub_place = #{subPlaceId}</if>
</where>
order by kseer.enter_time desc
</select>
@ -141,6 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join kitchen_staff_face ksf on kst.staff_id = ksf.staff_id
left join basic_canteen bc on kst.canteen_id = bc.canteen_id
left join basic_area ba on kst.area_id = ba.area_id
where kst.employee_no = #{employeeNo}
where kst.employee_no = #{employeeNo} or staff_no=#{employeeNo}
</select>
</mapper>