团队统计

lige

2024-01-26 62a3b99ee38ac963fd7d0d8e411bf9c3827e2946

团队统计

 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);

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

@@ -82,20 +82,6 @@
    public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "项目名称") String proName,
                              @RequestParam(required = false) @ApiParam(value = "检查类别") String checkType,
                              @RequestParam(required = false) @ApiParam(value = "部门id") String deptId) {
//        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
//        wq0.eq(TjProject::getProParentId, 0);
//        if(null !=proName){
//            wq0.like(TjProject::getProName,proName);
//        }
//        if(null !=checkType){
//            wq0.like(TjProject::getProCheckType,checkType);
//        }
//        if(null !=deptId){
//            wq0.like(TjProject::getDeptId,deptId);
//        }
//
//        List<TjProject> tjProjects = tjProjectService.list(wq0);

        //上面的换sql
        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);


 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java

@@ -202,6 +202,14 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long isPositive;



    @TableField(exist = false)
    private String tjNumber;

    @TableField(exist = false)
    private String cusName;

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)