bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2025-09-09 13:15:32 +08:00
parent 3645b756e8 ced8513428
commit 54b4e9557a
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java
View File

@ -22,6 +22,11 @@ public class PmAttDevice {
*/ */
private String deviceName; private String deviceName;
/**
* 出场编号
*/
private String serialNumber;
/** /**
* 工程id * 工程id
*/ */

5
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java
View File

@ -25,6 +25,11 @@ public class PmAttDeviceVo {
@Excel(name = "考勤机名称",sort = 2) @Excel(name = "考勤机名称",sort = 2)
private String deviceName; private String deviceName;
/**
* 出场编号
*/
private String serialNumber;
/** /**
* 工程id * 工程id
*/ */

12
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml
View File

@ -2,15 +2,15 @@
<!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.bonus.bmw.mapper.PmAttDeviceMapper"> <mapper namespace="com.bonus.bmw.mapper.PmAttDeviceMapper">
<insert id="addPmAttDevice"> <insert id="addPmAttDevice">
insert into pm_att_device (device_code, device_name, pro_id,create_user, update_user, insert into pm_att_device (device_code, device_name,serial_number, pro_id,create_user, update_user,
create_time, update_time,dev_model,on_line) create_time, update_time,dev_model,on_line)
values (#{deviceCode}, #{deviceName},#{proId}, #{createUser}, #{updateUser}, values (#{deviceCode}, #{deviceName},#{serialNumber},#{proId}, #{createUser}, #{updateUser},
#{createTime}, #{updateTime},#{devModel},#{onLine}) #{createTime}, #{updateTime},#{devModel},#{onLine})
</insert> </insert>
<insert id="addPmAttDeviceHis"> <insert id="addPmAttDeviceHis">
insert into pm_att_device_his (device_code, device_name, pro_id,create_user, update_user, insert into pm_att_device_his (device_code, device_name,serial_number, pro_id,create_user, update_user,
create_time, update_time) create_time, update_time)
values (#{deviceCode}, #{deviceName},#{proId}, #{createUser}, #{updateUser}, values (#{deviceCode}, #{deviceName},#{serialNumber},#{proId}, #{createUser}, #{updateUser},
#{createTime}, #{updateTime}) #{createTime}, #{updateTime})
</insert> </insert>
<update id="updatePmAttDevice"> <update id="updatePmAttDevice">
@ -24,6 +24,7 @@
<select id="selectPmAttDeviceList" resultType="com.bonus.bmw.domain.vo.PmAttDeviceVo"> <select id="selectPmAttDeviceList" resultType="com.bonus.bmw.domain.vo.PmAttDeviceVo">
select pad2.device_code as deviceCode, select pad2.device_code as deviceCode,
pad2.device_name as deviceName, pad2.device_name as deviceName,
pad2.serial_number as serialNumber,
pad2.pro_id as proId, pad2.pro_id as proId,
pp.pro_name as proName, pp.pro_name as proName,
pp.is_shanghai as isShanghai, pp.is_shanghai as isShanghai,
@ -35,6 +36,9 @@
<if test="deviceCode!=null and deviceCode!=''"> <if test="deviceCode!=null and deviceCode!=''">
and pad2.device_code LIKE CONCAT('%', #{deviceCode}, '%') and pad2.device_code LIKE CONCAT('%', #{deviceCode}, '%')
</if> </if>
<if test="serialNumber!=null and serialNumber!=''">
and pad2.serial_number LIKE CONCAT('%', #{serialNumber}, '%')
</if>
<if test="deviceName!=null and deviceName!=''"> <if test="deviceName!=null and deviceName!=''">
and pad2.device_name LIKE CONCAT('%', #{deviceName}, '%') and pad2.device_name LIKE CONCAT('%', #{deviceName}, '%')
</if> </if>