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

问题修改

This commit is contained in:
1539530615@qq.com 2024-03-15 18:00:23 +08:00
parent 45d26cf0d4
commit beb33397a8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -201,7 +201,10 @@
left join ma_machine mm on mm.ma_id = rad.ma_id
left join sys_user su on rad.repairer = su.user_id
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
where rad.task_id = #{taskId} and rad.company_id = #{companyId}
where rad.task_id = #{taskId}
<if test="companyId != null and companyId != ''">
and rad.company_id = #{companyId}
</if>
<if test="keyword != null and keyword != ''">
AND (locate(#{keyword}, mm.ma_code) > 0
or locate(#{keyword}, su.nick_name) > 0

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
View File

@ -32,8 +32,7 @@ public class AgreementInfoController extends BaseController {
*/
@ApiOperation(value = "获取协议管理列表")
@GetMapping("/getAgreementInfoAll")
public TableDataInfo getAgreementInfoAll(AgreementInfo bean)
{
public TableDataInfo getAgreementInfoAll(AgreementInfo bean) {
startPage();
List<AgreementInfo> list = agreementInfoService.getAgreementInfoAll(bean);
return getDataTable(list);

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml
View File

@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by sai.start_time desc
</select>
<select id="getRecordsFour" resultType="com.bonus.sgzb.material.domain.TeamLeaseInfo">
select tli.team_name as teamName
select tli.team_name as teamName,
mt1.type_name AS typeName,
mt.type_name AS modelName,
tli.num,