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

Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc

This commit is contained in:
BianLzhaoMin 2024-07-18 11:17:46 +08:00
parent 274837d9a4 22965b6d73
commit d6378da490
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java
View File

@ -47,7 +47,7 @@ public class StorageStatus {
* 规格型号 * 规格型号
*/ */
@ApiModelProperty(value = "规格型号") @ApiModelProperty(value = "规格型号")
@Excel(name = "规格名称") @Excel(name = "规格型号")
private String typeModelName; private String typeModelName;
/** /**
@ -111,14 +111,12 @@ public class StorageStatus {
* 租赁数量 * 租赁数量
*/ */
@ApiModelProperty(value = "租赁数量") @ApiModelProperty(value = "租赁数量")
@Excel(name = "租赁数量",cellType = Excel.ColumnType.NUMERIC)
private Double outNum; private Double outNum;
/** /**
* 归还数量 * 归还数量
*/ */
@ApiModelProperty(value = "归还数量") @ApiModelProperty(value = "归还数量")
@Excel(name = "归还数量",cellType = Excel.ColumnType.NUMERIC)
private Double backNum; private Double backNum;

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
View File

@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
baif.`code`, baif.`code`,
mm.ma_code AS maCode, mm.ma_code AS maCode,
bcd.back_num AS backNum, bcd.back_num AS backNum,
su.nick_name AS backPerson, baif.back_person AS backPerson,
bcd.create_time AS createTime, bcd.create_time AS createTime,
bpl.lot_name AS proName, bpl.lot_name AS proName,
bui.unit_name AS unitName bui.unit_name AS unitName
@ -114,7 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
LEFT JOIN sys_user su ON su.user_id = baif.back_person
where 1 = 1 where 1 = 1
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and (baif.`code` like concat('%',#{keyWord},'%') or and (baif.`code` like concat('%',#{keyWord},'%') or
@ -139,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="agreementCode != null and agreementCode != ''"> <if test="agreementCode != null and agreementCode != ''">
and bai.agreement_code like concat('%',#{agreementCode},'%') and bai.agreement_code like concat('%',#{agreementCode},'%')
</if> </if>
ORDER BY bcd.create_time DESC
</select> </select>
<select id="getAllList" resultType="com.bonus.sgzb.material.domain.BackApplyInfo"> <select id="getAllList" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">
SELECT SELECT

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/LeaseRecordMapper.xml
View File

@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mm.ma_code as maCode, mm.ma_code as maCode,
mt.unit_name as unit, mt.unit_name as unit,
lod.out_num as preNum, lod.out_num as preNum,
su.nick_name as leasePerson, lai.lease_person as leasePerson,
lod.create_time as createTime, lod.create_time as createTime,
bpl.lot_name as proName, bpl.lot_name as proName,
bui.unit_name as unitName bui.unit_name as unitName
@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt on mt.type_id = lod.type_id LEFT JOIN ma_type mt on mt.type_id = lod.type_id
LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id
LEFT JOIN sys_user su on su.user_id = lai.lease_person LEFT JOIN sys_user su on su.user_id = lai.create_by
where 1 = 1 where 1 = 1
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and (bai.agreement_code like concat('%',#{keyWord},'%') or and (bai.agreement_code like concat('%',#{keyWord},'%') or

6
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time, SELECT bai.agreement_id, bai.agreement_code , contract_code,file_url ,file_name,sign_time,
bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName, bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
plan_start_time,lease_day,auth_person,phone,bai.remark,bai.protocol,sar.cost as cost, plan_start_time,lease_day,auth_person,phone,bai.remark,bai.protocol,sar.cost as cost,
case when sar.id is null then '1' when sar.status = '0' then '2' when sar.status = '1' then '3' end as sltStatus case when sar.id is null then '1' when sar.status = '0' then '3' when sar.status = '1' then '2' end as sltStatus
FROM bm_agreement_info bai FROM bm_agreement_info bai
LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
@ -106,10 +106,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sar.id is null and sar.id is null
</when> </when>
<when test="sltStatus == '2'.toString()"> <when test="sltStatus == '2'.toString()">
and sar.status = '0' and sar.status = '1'
</when> </when>
<when test="sltStatus == '3'.toString()"> <when test="sltStatus == '3'.toString()">
and sar.status = '1' and sar.status = '0'
</when> </when>
<otherwise> <otherwise>