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

退料审核代码提交

This commit is contained in:
liang.chao 2024-04-22 11:19:06 +08:00
parent a10c3dd8a7
commit b4c3540fb5
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,17 +387,17 @@ public class TmTaskController extends BaseController {
* 查询机具领料管理列表 * 查询机具领料管理列表
* *
* @param task 筛选条件 * @param task 筛选条件
* @param souceBy app为1 web为0 * @param sourceBy app为1 web为0
* @return 列表 * @return 列表
*/ */
@Log(title = "重庆查询机具领料管理列表", businessType = BusinessType.QUERY) @Log(title = "重庆查询机具领料管理列表", businessType = BusinessType.QUERY)
@GetMapping(value = "getLeaseManageListAllCq") @GetMapping(value = "getLeaseManageListAllCq")
public AjaxResult getLeaseManageListAllCq(TmTask task, Integer souceBy) { public AjaxResult getLeaseManageListAllCq(TmTask task, Integer sourceBy) {
if (StringUtils.isNull(task)) { if (StringUtils.isNull(task)) {
return AjaxResult.error("参数错误"); return AjaxResult.error("参数错误");
} }
List<TmTask> leaseAuditList; List<TmTask> leaseAuditList;
if (souceBy != null && souceBy == 1) { if (sourceBy != null && sourceBy == 1) {
leaseAuditList = tmTaskService.getLeaseAuditManageListCq(task); leaseAuditList = tmTaskService.getLeaseAuditManageListCq(task);
return AjaxResult.success(leaseAuditList); return AjaxResult.success(leaseAuditList);
} }

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -635,7 +635,7 @@ public class TmTaskServiceImpl implements TmTaskService {
if (tmTask != null) { if (tmTask != null) {
// 去查询任务分单表 // 去查询任务分单表
List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
//没有companyId的用户可以看到所有数据 //没有companyId的用户或者是分公司账号可以看到所有数据
if (companyId == null || roles.contains("fgs")) { if (companyId == null || roles.contains("fgs")) {
// 对领料任务集合查询具体详情 // 对领料任务集合查询具体详情
for (LeaseApplyInfo leaseApplyInfo : collect) { for (LeaseApplyInfo leaseApplyInfo : collect) {

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

@ -694,6 +694,10 @@
update_by = #{record.companyAuditBy}, update_by = #{record.companyAuditBy},
update_time = now(), update_time = now(),
</if> </if>
<if test="record.examineStatusId == 117 and record.examineStatusId == '117'">
update_by = #{record.companyAuditBy},
update_time = now(),
</if>
</trim> </trim>
WHERE WHERE
task_id = #{record.taskId} and company_id = #{record.companyId} task_id = #{record.taskId} and company_id = #{record.companyId}