zjh20240911

zjh

2024-09-11 3844954e02e67611fd57dafa236ee2c20e258b78

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

@@ -96,7 +96,6 @@
    private ISysDictDataService dictDataService;
    @Resource
    private ITbTransitionService transitionService;

    @Autowired
    private ITjBigPositiveService tjBigPositiveService;
    @Autowired
@@ -317,33 +316,35 @@
        TjOrder tjOrder = tjOrderService.getOne(queryWrapper);
        if (null != tjOrder) {
            LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
            TjReportTemplate reportTemplate = null;
            if (tjOrder.getTjCategory() != null) {
                //查询字典
                LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
                wqq.eq(SysDictData::getDictType, "dict_tjtype");
                wqq.eq(SysDictData::getDictValue, tjOrder.getTjCategory());
                SysDictData one = dictDataService.getOne(wqq);
                if (one != null) {
                    //查询字典
                    LambdaQueryWrapper<SysDictData> wqq1 = new LambdaQueryWrapper<>();
                    wqq1.eq(SysDictData::getDictType, "report_template_type");
                    wqq1.eq(SysDictData::getDictLabel, one.getDictLabel());
                    SysDictData one1 = dictDataService.getOne(wqq1);
                    if (one1 != null) {
                        tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, one1.getDictValue());
                    } else {
                        tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
                    }
                } else {
                    tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
                }
                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
                reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
            } else {
                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
                reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
            }
            tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
            tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
            TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
//            if (tjOrder.getTjCategory() != null) {
//                //查询字典
//                LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
//                wqq.eq(SysDictData::getDictType, "dict_tjtype");
//                wqq.eq(SysDictData::getDictValue, tjOrder.getTjCategory());
//                SysDictData one = dictDataService.getOne(wqq);
//                if (one != null) {
//                    //查询字典
//                    LambdaQueryWrapper<SysDictData> wqq1 = new LambdaQueryWrapper<>();
//                    wqq1.eq(SysDictData::getDictType, "report_template_type");
//                    wqq1.eq(SysDictData::getDictLabel, one.getDictLabel());
//                    SysDictData one1 = dictDataService.getOne(wqq1);
//                    if (one1 != null) {
//                        tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, one1.getDictValue());
//                    } else {
//                        tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
//                    }
//                } else {
//                    tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
//                }
//                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
//                reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
//            } else {
//                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
//                reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
//            }
            Integer checkStatus = tjOrder.getCheckStatus();
            if (checkStatus == 1) {
                if ("报表".equals(reportTemplate.getPrint())) {
@@ -420,8 +421,7 @@
        return AjaxResult.error();
    }

    @Autowired
    private TjReportController tjReportController;


    /**
     * 撤销
@@ -1466,34 +1466,11 @@
        //创建map 键为父项目  值为子项目集合
        Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();
        //查到该客户的体检记录
//        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
//        wq1.eq(TjOrder::getTjNumber, tjNumber);
//        TjOrder one = tjOrderService.getOne(wq1);

        //拿到体检记录的orderid，查出项目详细信息
//        LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
//        wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
//        //20230323判断项目已检
//        wq.ne(TjOrderDetail::getTjStatus, 0);
//        wq.eq(TjOrderDetail::getProId,projectService.getHuaYanProId());
//        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanAndCgTable(tjNumber);
        //遍历体检记录 将项目的具体信息
        //遍历客户所选的项目(包含子项父项)
//        for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
//            TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
//            if (null != tjProject) {
//                tjOrderDetail.setProject(tjProject);
//            }
//        }

//        LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
//        wq22.eq(TjCustomer::getCusId, one.getUserId());
//        TjCustomer customer = tjCustomerService.getOne(wq22);
//        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
//        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
//        wqq.eq(TjOrderRemark::getDeptId,"241");
//        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanAndCgTable(tjNumber);

        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanAndCgTable(tjNumber);
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, null);
@@ -1517,7 +1494,7 @@
                }
            }
            printReport.put(entry.getKey(), tjPdfVOS);
            if (tjPdfVOS.size() == 0) {
            if (tjPdfVOS.isEmpty()) {
                toRemoveKeys.add(entry.getKey());
            }
        }
@@ -1622,7 +1599,7 @@
                LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
                wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
                List<TjStandard> list2 = tjStandardService.list(wq6);
                if (list2.size() == 0) {
                if (list2.isEmpty()) {
                    TjStandard s = new TjStandard();
                    s.setCompany(" ");
                    s.setTjStandardLtValue(" ");