From 6edab72ee16e3c173a813cec6cefa5af03147f97 Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期四, 25 一月 2024 18:12:42 +0800 Subject: [PATCH] tuanduitongji --- ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/TjProFenXiDto.java | 19 +++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java | 52 ++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java index 89b13d2..1695b6f 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java @@ -48,7 +48,11 @@ private ITjRulesService tjRulesService; @Resource private ITjOrderDetailRulesService detailRulesService; + @Autowired + private ITjOrderDetailService tjOrderDetailService; + @Autowired + private ITjProjectService tjProjectService; @GetMapping("/getDeptAndDwDeptByComp") @@ -214,4 +218,52 @@ return AjaxResult.success(list); } + + + + @PostMapping("/getJieGuoFenXi") + @ApiOperation(value = "缁撴灉鍒嗘瀽鎺ュ彛") + public AjaxResult getJieGuoFenXi(@ApiParam(value = "闆嗗悎") @RequestBody TjProFenXiDto dto) { + + List<String> tjNums = dto.getTjNums(); + List<Long> proIds = dto.getProIds(); + + if(null==tjNums || tjNums.size()==0){ + return AjaxResult.error("璇烽�夋嫨浜哄憳"); + } + + if(null==proIds || proIds.size()==0){ + return AjaxResult.error("璇烽�夋嫨椤圭洰"); + } + List<Long> orderIds=new ArrayList<>(); + for (String tjNum : tjNums) { + LambdaQueryWrapper<TjOrder> wqtj=new LambdaQueryWrapper<>(); + wqtj.eq(TjOrder::getTjNumber,tjNum); + final TjOrder one = orderService.getOne(wqtj); + orderIds.add(one.getOrderId()); + } + List<Map<String,Object>> res=new ArrayList<>(); + for (Long proId : proIds) { + Map<String,Object> map=new HashMap<>(); + LambdaQueryWrapper<TjOrderDetail> wq1=new LambdaQueryWrapper<>(); + wq1.eq(TjOrderDetail::getProId,proId); + wq1.in(TjOrderDetail::getOrderId,orderIds); + wq1.eq(TjOrderDetail::getExceptionDesc,0); + final List<TjOrderDetail> list1 = tjOrderDetailService.list(wq1); + + LambdaQueryWrapper<TjOrderDetail> wq2=new LambdaQueryWrapper<>(); + wq2.eq(TjOrderDetail::getProId,proId); + wq2.in(TjOrderDetail::getOrderId,orderIds); + wq2.eq(TjOrderDetail::getExceptionDesc,1); + final List<TjOrderDetail> list2 = tjOrderDetailService.list(wq2); + + map.put("project",tjProjectService.getById(proId)); + map.put("zhengchang",list1); + map.put("yichang",list2); + res.add(map); + } + + return AjaxResult.success(res); + } + } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/TjProFenXiDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/TjProFenXiDto.java new file mode 100644 index 0000000..71bb186 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/TjProFenXiDto.java @@ -0,0 +1,19 @@ +package com.ltkj.hosp.vodomain; + +import lombok.Data; + +import java.util.List; + +/** + * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃 + * @Author: zjh + * @Date: 2023/9/4 16:13 + */ + + +@Data +public class TjProFenXiDto { + + private List<String> tjNums; + private List<Long> proIds; +} -- Gitblit v1.8.0