bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

批量合格

This commit is contained in:
sxu 2024-11-25 10:41:16 +08:00
parent 4687d3f3c6
commit f4d05cba0d
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
View File

@ -136,12 +136,12 @@ public class RepairController extends BaseController {
}
/**
* 维修明细--批量审核--更新明细status
* 维修明细--批量合格--更新明细status，以及repairedNum
*/
@ApiOperation(value = "维修明细更新status--批量")
@PostMapping("/completeRepair")
public AjaxResult completeRepair(@RequestBody ArrayList<Long> ids) {
return toAjax(service.completeRepair(ids));
@ApiOperation(value = "维修明细更新status--批量合格")
@PostMapping("/batchQualified")
public AjaxResult batchQualified(@RequestBody ArrayList<Long> ids) {
return toAjax(service.batchQualified(ids));
}
/**

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java
View File

@ -1,7 +1,6 @@
package com.bonus.material.repair.mapper;
import com.bonus.material.repair.domain.*;
import com.bonus.material.repair.domain.vo.RepairDeviceListVo;
import com.bonus.material.repair.domain.vo.RepairDeviceVO;
import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
import com.bonus.system.api.domain.SysUser;
@ -91,7 +90,7 @@ public interface RepairMapper {
* @param ids 主键集合
* @param userId 用户id
*/
int completeRepair(@Param("ids") ArrayList<Long> ids, @Param("userId") Long userId);
int batchQualified(@Param("ids") ArrayList<Long> ids, @Param("userId") Long userId);
/**
* 查询维修人员列表

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java
View File

@ -6,7 +6,6 @@ import com.bonus.material.repair.domain.RepairApplyRecord;
import com.bonus.material.repair.domain.RepairInputDetails;
import com.bonus.material.repair.domain.RepairTask;
import com.bonus.material.repair.domain.RepairTaskDetails;
import com.bonus.material.repair.domain.vo.RepairDeviceListVo;
import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo;
import com.bonus.material.repair.domain.vo.RepairDeviceVO;
import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
@ -59,9 +58,9 @@ public interface RepairService {
AjaxResult batchRepairApply(@NotNull List<RepairDeviceVO> repairDeviceVOList);
/**
* 维修明细--批量审核--更新明细status
* 维修明细--批量合格--更新明细status，以及repairedNum
*/
int completeRepair(ArrayList<Long> ids);
int batchQualified(ArrayList<Long> ids);
/**
* 查询维修人员列表

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.bonus.material.repair.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.NumberUtil;
import com.bonus.common.biz.enums.MaTypeManageTypeEnum;
@ -835,12 +834,12 @@ public class RepairServiceImpl implements RepairService {
}
/**
* 维修明细--批量审核--更新明细status
* 维修明细--批量合格--更新明细status，以及repairedNum
*/
@Override
public int completeRepair(ArrayList<Long> ids) {
public int batchQualified(ArrayList<Long> ids) {
LoginUser loginUser = SecurityUtils.getLoginUser();
return repairMapper.completeRepair(ids, loginUser.getUserid());
return repairMapper.batchQualified(ids, loginUser.getUserid());
}
@Override

3
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
View File

@ -86,9 +86,10 @@
where id = #{id}
</update>
<update id="completeRepair">
<update id="batchQualified">
update repair_apply_details
set status = '1',
repaired_num = repair_num,
update_by = #{userId},
update_time = now()
where id in