zjh 本地 2024/02/28 -1

zjh

2024-02-28 22c17adc3ec2a25e6656cd69961f49a888d433b3

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java

@@ -54,6 +54,9 @@
    @Autowired
    private ITjProjectService tjProjectService;

    @Autowired
    private IDictCompService dictCompService;


    @GetMapping("/getDeptAndDwDeptByComp")
    @ApiOperation(value = "根据单位查询部门和单位部门信息")
@@ -114,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);
                }
            }
@@ -250,12 +255,39 @@
            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);