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

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

This commit is contained in:
csyue 2024-06-14 13:51:10 +08:00
parent 5f5b7bccae dd94f1ee56
commit f7bb700762
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaLabelBind.java
View File

@ -20,49 +20,49 @@ public class MaLabelBind {
* 机具ID
*/
@Excel(name = "机具ID")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "机具ID")
private Long maId;
/**
* 标签编号
*/
@Excel(name = "标签编号")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "标签编号")
private String labelCode;
/**
* 类型ID
*/
@Excel(name = "类型ID")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "类型ID")
private Long typeId;
/**
* 绑定时间
*/
@Excel(name = "绑定时间")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "绑定时间")
private Date bindTime;
/**
* 绑定人
*/
@Excel(name = "绑定人")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "绑定人")
private String binder;
/**
* 是否绑定(0 是, 1 否)
*/
@Excel(name = "是否绑定")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "是否绑定")
private String isBind;
/**
* 标签类型(数据字典)
*/
@Excel(name = "标签类型(数据字典)")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "标签类型(数据字典)")
private Integer labelType;
/**
* 数据所属组织
*/
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/**
* 0已解绑 1已绑定

2
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
View File

@ -175,7 +175,7 @@ public class MaMachine extends BaseEntity {
/**
* 绑定人
*/
@ApiModelProperty(value = "种类id")
@ApiModelProperty(value = "绑定人")
private String binder;
/**
* 标签编号

7
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -175,21 +175,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="selectMaTypeList" parameterType="String" resultMap="MaTypeResult">
select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
select DISTINCT m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
m.remark, m.company_id ,m.type_id id , m.type_name label
from ma_type m
left join ma_prop_set mps on m.type_id = mps.type_id
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0'
left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0'
left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
left join ma_type_keeper mtk on mtf.type_id = mtk.type_id
left join sys_user su on mtk.user_id = su.user_id
<where>
m.status = '0'
and m.del_flag = '0'
<if test="typeName != null and typeName !=''">
AND type_name like concat('%',#{typeName},'%')
</if>