From 1630243ed75a92c60d0638e7d14477e4aadcf2b7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 四月 2025 17:41:44 +0800
Subject: [PATCH] zjh20250418
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 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..53b9554 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,14 @@
private ITjRulesService tjRulesService;
@Resource
private ITjOrderDetailRulesService detailRulesService;
+ @Autowired
+ private ITjOrderDetailService tjOrderDetailService;
+ @Autowired
+ private ITjProjectService tjProjectService;
+
+ @Autowired
+ private IDictCompService dictCompService;
@GetMapping("/getDeptAndDwDeptByComp")
@@ -110,7 +117,9 @@
vo.setSex(record.getSex());
vo.setDepartment(record.getDepartment());
vo.setAge(record.getAge());
- vo.setCompany(record.getCompany());
+ if (record.getCompanyId()!=null){
+ vo.setCompany(dictCompService.getById(record.getCompanyId()).getCnName());
+ }
reservationPage.add(vo);
}
}
@@ -214,4 +223,79 @@
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);
+ if (list1!=null){
+ for (TjOrderDetail tjOrderDetail : list1) {
+ final TjOrder byId = orderService.getById(tjOrderDetail.getOrderId());
+ if (byId!=null){
+ tjOrderDetail.setTjNumber(byId.getTjNumber());
+ final TjCustomer byId1 = customerService.getById(byId.getUserId());
+ tjOrderDetail.setCusName(byId1.getCusName());
+ }else {
+ tjOrderDetail.setTjNumber("鏈煡");
+ tjOrderDetail.setCusName("鏈煡");
+ }
+
+ }
+ }
+ 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);
+ if(list2!=null){
+ for (TjOrderDetail tjOrderDetail : list2) {
+ final TjOrder byId = orderService.getById(tjOrderDetail.getOrderId());
+ if (byId!=null){
+ tjOrderDetail.setTjNumber(byId.getTjNumber());
+ final TjCustomer byId1 = customerService.getById(byId.getUserId());
+ tjOrderDetail.setCusName(byId1.getCusName());
+ }else {
+ tjOrderDetail.setTjNumber("鏈煡");
+ tjOrderDetail.setCusName("鏈煡");
+ }
+
+ }
+ }
+
+ map.put("project",tjProjectService.getById(proId));
+ map.put("zhengchang",list1);
+ map.put("yichang",list2);
+ res.add(map);
+ }
+
+ return AjaxResult.success(res);
+ }
+
}
--
Gitblit v1.8.0