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

app领料申请详情bug提交

This commit is contained in:
liang.chao 2024-04-30 14:09:40 +08:00
parent 1419b8c32d
commit 1030c78305
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/CompositeQueryController.java
View File

@ -1,13 +1,10 @@
package com.bonus.sgzb.app.controller;
import cn.hutool.core.collection.CollUtil;
import com.bonus.sgzb.app.domain.StorageStatus;
import com.bonus.sgzb.app.service.HoldingLedgerService;
import com.bonus.sgzb.base.api.domain.LeaseOutDetails;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;

13
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -496,13 +496,19 @@ public class TmTaskController extends BaseController {
if (StringUtils.isNull(task)) {
return AjaxResult.error("参数错误");
}
startPage();
if (SecurityUtils.getLoginUser() != null) {
Long userid = SecurityUtils.getLoginUser().getUserid();
task.setUserId(String.valueOf(userid));
}
List<TmTask> leaseAuditList = tmTaskService.getLeaseAuditListByOne(task);
return AjaxResult.success(getDataTable(leaseAuditList));
// app端传1
if (task.getSouceBy() == 1) {
List<TmTask> leaseAuditList = tmTaskService.getLeaseAuditListByOne(task);
return AjaxResult.success(leaseAuditList);
} else {
startPage();
List<TmTask> leaseAuditList = tmTaskService.getLeaseAuditListByOne(task);
return AjaxResult.success(getDataTable(leaseAuditList));
}
}
/**
@ -543,6 +549,7 @@ public class TmTaskController extends BaseController {
}
}
/**
* 重庆修改任务信息
*/

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -265,5 +265,6 @@ public class TmTask implements Serializable {
private Date estimateLeaseTime;
private Integer souceByRefuse;
private Integer souceBy;
}

4
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -526,6 +526,7 @@
AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or
tt.code like concat('%', #{record.keyWord}, '%'))
</if>
GROUP BY tt.task_id
ORDER BY tt.update_time DESC
</select>
@ -952,6 +953,7 @@
AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or
tt.code like concat('%', #{record.keyWord}, '%'))
</if>
GROUP BY tt.task_id
ORDER BY tt.update_time DESC
</select>
<select id="getLeaseApplyDetailsByApply" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
@ -1045,14 +1047,12 @@
mt.manage_type as manageType,
mt.num as num,
su.user_name as userName,
mm.ma_code as maCode,
lad.type_id as typeId
FROM
lease_apply_details lad
LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id
LEFT JOIN ma_type mt on lad.type_id = mt.type_id
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
LEFT JOIN ma_machine mm on mt.type_id = mm.type_id
LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
LEFT JOIN sys_user su on mtk.user_id = su.user_id
WHERE