zjh20250213

zjh

2025-02-13 e11b4dac388d10f60db8682b42314983c3b0eb8d

zjh20250213

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

@@ -314,18 +314,18 @@

        TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
        if (null != tjOrder) {
        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if(null != config && config.equalsIgnoreCase("Y")){
            int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
            if (num > 0) {
                tjOrder.setReportTime(null);
                tjOrder.setCheckTime(null);
                tjOrder.setCheckStatus(0);
                tjOrder.setPrintLastTime(null);
                tjOrderService.updateById(tjOrder);
                return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
            String config = configService.selectConfigByKey("sfjcwjhyqxm");
            if(null != config && config.equalsIgnoreCase("Y")){
                int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
                if (num > 0) {
                    tjOrder.setReportTime(null);
                    tjOrder.setCheckTime(null);
                    tjOrder.setCheckStatus(0);
                    tjOrder.setPrintLastTime(null);
                    tjOrderService.updateById(tjOrder);
                    return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
                }
            }
        }
            //判断表中有没有该体检报告  不能重复生成
            LambdaQueryWrapper<TjReport> wqa = new LambdaQueryWrapper<>();
            wqa.eq(TjReport::getTjNumber, tjNumber);
@@ -420,7 +420,7 @@
                    tjOrder.setPrintLastTime(null);
                    tjOrderService.updateById(tjOrder);

                    logger.error("生成报告异常");
                    logger.error(String.valueOf(e));
                    return AjaxResult.error("生成报告失败");
                }
            } else {