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 12:01:55 +08:00
parent ce694dfc11
commit 18e164775e
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ public class RepairController extends BaseController {
@ApiOperation(value = "获取修试后入库列表") @ApiOperation(value = "获取修试后入库列表")
@GetMapping("getRepairedList") @GetMapping("getRepairedList")
@RequiresPermissions("warehousing:repair:list") @RequiresPermissions("warehousing:repair:list")
public TableDataInfo getRepairedList(RepairInputDetails dto){ public TableDataInfo getRepairedList(RepairInputDetailsVo dto){
startPage(); startPage();
List<RepairInputDetailsVo> list = service.getRepairedList(dto); List<RepairInputDetailsVo> list = service.getRepairedList(dto);
return getDataTable(list); return getDataTable(list);

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairInputDetailsVo.java
View File

@ -31,4 +31,11 @@ public class RepairInputDetailsVo {
/** 单位 */ /** 单位 */
private String unitName; private String unitName;
/** 关键字*/
private String keyWord;
/** 设备类型*/
private String deviceTypeId;
} }

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

@ -157,5 +157,5 @@ public interface RepairMapper {
BigDecimal selectPartPrice(Long partId); BigDecimal selectPartPrice(Long partId);
List<RepairInputDetailsVo> getRepairedList(RepairInputDetails dto); List<RepairInputDetailsVo> getRepairedList(RepairInputDetailsVo dto);
} }

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

@ -81,5 +81,5 @@ public interface RepairService {
*/ */
List<RepairTask> exportRepairTaskList(RepairTask bean); List<RepairTask> exportRepairTaskList(RepairTask bean);
List<RepairInputDetailsVo> getRepairedList(RepairInputDetails dto); List<RepairInputDetailsVo> getRepairedList(RepairInputDetailsVo dto);
} }

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

@ -844,7 +844,7 @@ public class RepairServiceImpl implements RepairService {
} }
@Override @Override
public List<RepairInputDetailsVo> getRepairedList(RepairInputDetails dto) { public List<RepairInputDetailsVo> getRepairedList(RepairInputDetailsVo dto) {
return repairMapper.getRepairedList(dto); return repairMapper.getRepairedList(dto);
} }
} }

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

@ -414,20 +414,19 @@
ANY_VALUE(tt.`code`) AS repairCode, ANY_VALUE(tt.`code`) AS repairCode,
ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2, ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
bpl.lot_name projectName, bpl.pro_name projectName,
bui.unit_name unitName, bui.unit_name unitName,
ANY_VALUE(us.user_name) AS wxName, ANY_VALUE(us.user_name) AS wxName,
ANY_VALUE(tt.create_time) AS wxTime, ANY_VALUE(tt.create_time) AS wxTime,
ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus tt.task_status AS taskStatus
FROM repair_input_details rid FROM repair_input_details rid
LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id
LEFT JOIN sys_user us on us.user_id=rad.repairer LEFT JOIN sys_user us on us.user_id=rad.repairer
LEFT JOIN tm_task tt ON rid.task_id = tt.task_id LEFT JOIN tm_task tt ON rid.task_id = tt.task_id
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id LEFT JOIN bm_project bpl ON bai.project_id = bpl.pro_id
LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id LEFT JOIN bm_unit bui ON bai.unit_id = bui.unit_id
LEFT JOIN sys_dic sd ON tt.task_status = sd.id
LEFT JOIN tm_task tt2 ON rad.task_id = tt2.task_id LEFT JOIN tm_task tt2 ON rad.task_id = tt2.task_id
LEFT JOIN ( LEFT JOIN (
SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2 SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2