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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
dingjie 2023-12-23 21:31:37 +08:00
parent 91943ddfb4 ec1824b586
commit 8ae7102597
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
View File

@ -75,6 +75,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
MaMachine maMachine =new MaMachine(); MaMachine maMachine =new MaMachine();
maMachine.setMaCode(maLabelBind.getMaCode()); maMachine.setMaCode(maLabelBind.getMaCode());
maMachine.setTypeId(maLabelBind.getTypeId()); maMachine.setTypeId(maLabelBind.getTypeId());
maMachine.setQrCode(maLabelBind.getLabelCode());
maLabelBindMapper.insertMaLabel(maMachine); maLabelBindMapper.insertMaLabel(maMachine);
maLabelBind.setMaId(String.valueOf(maMachine.getMaId())); maLabelBind.setMaId(String.valueOf(maMachine.getMaId()));
maLabelBind.setStatus("1"); maLabelBind.setStatus("1");

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
View File

@ -57,7 +57,7 @@
<if test="wpName != null and wpName != ''"> and mt3.type_name = #{wpName}</if> <if test="wpName != null and wpName != ''"> and mt3.type_name = #{wpName}</if>
<if test="isBind != null and isBind != ''"> and b.is_bind = #{isBind}</if> <if test="isBind != null and isBind != ''"> and b.is_bind = #{isBind}</if>
</where> </where>
ORDER BY b.is_bind ASC ORDER BY b.is_bind ASC,b.create_time DESC
</select> </select>
<select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult"> <select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name, SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
@ -190,7 +190,7 @@
</trim> </trim>
</insert> </insert>
<insert id="insertMaLabel" useGeneratedKeys="true" keyProperty="maId"> <insert id="insertMaLabel" useGeneratedKeys="true" keyProperty="maId">
insert into ma_machine (type_id,ma_code,create_time) insert into ma_machine (type_id,ma_code,ma_status,qr_code,create_time)
values (#{typeId},#{maCode},now()); values (#{typeId},#{maCode},'15',#{qrCode},now());
</insert> </insert>
</mapper> </mapper>