2024-12-09

zhaowenxuan

2024-12-09 0348f5a8184bd0a05434562f0021c2bb50628c32

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

@@ -39,6 +39,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Propagation;
@@ -56,9 +57,10 @@
 * @author ltkj
 * @date 2022-12-06
 */
@Slf4j
@RestController
@RequestMapping("/system/report")
@Api(tags = "体检报告")
@Api(tags = "AAAA_体检报告")
@Transactional
public class TjReportController extends BaseController {
    @Resource
@@ -106,12 +108,14 @@
    public AjaxResult savePdf() {
        //从文件地址读入PDF文件  仅存储一次
        String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
        reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"体检报告模板5"));
        TjReportTemplate tem = new TjReportTemplate();
        tem.setName("体检报告模板5");
        tem.setRemark("体检报告模板5");
        tem.setTemplate(base64String);
        tem.setFlag("1");
        tem.setOpen("0");
        tem.setCreateTime(DateUtil.date());
        final boolean save = reportTemplateService.save(tem);
        if (save) {
            return AjaxResult.success("保存成功");
@@ -297,9 +301,10 @@
//            return error;
//        }
//        return AjaxResult.success("该用户体检未完成，不能打印报告！！！");
        int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
        if (num > 0) {
            return AjaxResult.error("有延期项目暂不能生成报告!!!");
        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if(null != config && config.equalsIgnoreCase("Y")){
            int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
            if (num > 0) return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
        }

//        String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -389,7 +394,7 @@
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
                } catch (Exception e) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    e.printStackTrace();
                    log.error(String.valueOf(e));
                    // 调用撤销
//                    tjReportController.backOnlyCheckType(tjNumber);
                    logger.error("生成报告异常");
@@ -402,8 +407,14 @@
        return AjaxResult.error();
    }

    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
        AjaxResult ajaxResult = null;
        try {
            ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
        }
        if (!ajaxResult.get("code").toString().equals("200")) {
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        } else {
@@ -2049,6 +2060,7 @@
        } else {
            one.setStatus(TjConstants.TJ_CONFIRM);
        }
        one.setReportTime(null);
        //将状态改为未审核
//        UpdateWrapper updateWrapper=new UpdateWrapper();
//        updateWrapper.eq("tj_number",tjNumber);