fix：[试验管理]导出

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java

@@ -4,17 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hxhq.business.domain.GyzjFfjlJcgj;
-import com.hxhq.business.domain.GyzjFfjlJcgj;
 import com.hxhq.business.mapper.GyzjFfjlJcgjMapper;
 import com.hxhq.business.service.IGyzjFfjlJcgjService;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.GyzjJcnrUtil;
+import com.hxhq.business.utils.lang.GyzjJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 
-import java.rmi.ServerException;
 import java.util.List;
 import java.util.Map;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java

@@ -6,16 +6,13 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.GyzjJcgj;
-import com.hxhq.business.domain.GyzjJcgj;
-import com.hxhq.business.domain.GyzjJcgj;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.GyzjJcnrUtil;
+import com.hxhq.business.utils.lang.GyzjJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.GyzjJcgjMapper;
-import com.hxhq.business.domain.GyzjJcgj;
 import com.hxhq.business.service.IGyzjJcgjService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java

@@ -3,14 +3,12 @@ package com.hxhq.business.service.impl;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.GyzjJcgj;
 import com.hxhq.business.domain.GyzjTz;
-import com.hxhq.business.utils.GyzjJcnrUtil;
+import com.hxhq.business.utils.lang.GyzjJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.GyzjTzMapper;
-import com.hxhq.business.domain.GyzjTz;
 import com.hxhq.business.service.IGyzjTzService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlJcgjServiceImpl.java

@@ -3,12 +3,10 @@ package com.hxhq.business.service.impl;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.MjyJcgj;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.MjyJcnrUtil;
+import com.hxhq.business.utils.lang.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java

@@ -3,12 +3,11 @@ package com.hxhq.business.service.impl;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.MjyJcgj;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.MjyJcnrUtil;
+import com.hxhq.business.utils.lang.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.utils.MjyJcnrUtil;
+import com.hxhq.business.utils.lang.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java

@@ -7,16 +7,13 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.StudyFormApplyJcgj;
-import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormApplyJcgjMapper;
-import com.hxhq.business.domain.StudyFormApplyJcgj;
 import com.hxhq.business.service.IStudyFormApplyJcgjService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java

@@ -4,14 +4,11 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.StudyFormApplyQmxx;
-import com.hxhq.business.domain.StudyFormPreQmxx;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormApplyQmxxMapper;
-import com.hxhq.business.domain.StudyFormApplyQmxx;
 import com.hxhq.business.service.IStudyFormApplyQmxxService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java

@@ -6,21 +6,18 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
-import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.dto.study.StudyFormApplyListDto;
 import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.study.StudyFormApplyBdztEnum;
-import com.hxhq.business.enums.study.StudyFormApplyBdztEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
-import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.study.*;
 import com.hxhq.business.form.study.StudyFormApplySearchForm;
 import com.hxhq.business.service.IStudyFormApplyJcgjService;
 import com.hxhq.business.service.IStudyFormApplyQmxxService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java

@@ -6,14 +6,10 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.GyzjJcgj;
-import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java

@@ -3,10 +3,8 @@ package com.hxhq.business.service.impl;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.StudyFormPreQmxx;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormFillQmxxMapper;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -17,7 +17,7 @@ import com.hxhq.business.form.study.StudyFormFillSearchForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java

@@ -7,16 +7,13 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.StudyFormPlanJcgj;
-import com.hxhq.business.domain.StudyFormPlanJcgj;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPlanJcgjMapper;
-import com.hxhq.business.domain.StudyFormPlanJcgj;
 import com.hxhq.business.service.IStudyFormPlanJcgjService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java

@@ -4,14 +4,11 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.StudyFormPlanQmxx;
-import com.hxhq.business.domain.StudyFormPlanQmxx;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPlanQmxxMapper;
-import com.hxhq.business.domain.StudyFormPlanQmxx;
 import com.hxhq.business.service.IStudyFormPlanQmxxService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java

@@ -9,7 +9,6 @@ import com.hxhq.business.domain.*;
 import com.hxhq.business.domain.StudyFormPlan;
 import com.hxhq.business.dto.study.StudyFormPlanListDto;
 import com.hxhq.business.enums.study.StudyFormPlanBdztEnum;
-import com.hxhq.business.enums.study.StudyFormPlanBdztEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.form.study.StudyFormPlanSearchForm;
@@ -18,7 +17,7 @@ import com.hxhq.business.service.IStudyFormPlanJcgjService;
 import com.hxhq.business.service.IStudyFormPlanQmxxService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java

@@ -6,17 +6,14 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.MjyJcgj;
 import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.hxhq.business.utils.JctUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPreJcgjMapper;
-import com.hxhq.business.domain.StudyFormPreJcgj;
 import com.hxhq.business.service.IStudyFormPreJcgjService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java

@@ -4,15 +4,11 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.StudyFormPreQmxx;
-import com.hxhq.business.domain.StudyFormPreJcgj;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
-import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPreQmxxMapper;
-import com.hxhq.business.domain.StudyFormPreQmxx;
 import com.hxhq.business.service.IStudyFormPreQmxxService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

@@ -7,20 +7,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.study.StudyFormPreListDto;
-import com.hxhq.business.enums.NormalEnum;
-import com.hxhq.business.enums.study.StudyFormPlanBdztEnum;
 import com.hxhq.business.enums.study.StudyFormPreBdztEnum;
 import com.hxhq.business.enums.study.StudyFormPreFzrshztEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
-import com.hxhq.business.form.common.SignForm;
 import com.hxhq.business.form.study.StudyFormPreAuditForm;
 import com.hxhq.business.form.study.StudyFormPreSearchForm;
 import com.hxhq.business.form.study.StudyFormUpdateForm;
 import com.hxhq.business.service.*;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
-import com.hxhq.business.utils.StudyFormUtil;
+import com.hxhq.business.utils.lang.StudyFormUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
@@ -30,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormPreMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * 试验-预填单Service业务层处理

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java

@@ -1,5 +1,6 @@
-package com.hxhq.business.utils;
+package com.hxhq.business.utils.lang;
 
+import com.hxhq.business.utils.JctUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java

@@ -1,6 +1,6 @@
-package com.hxhq.business.utils;
+package com.hxhq.business.utils.lang;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.hxhq.business.utils.JctUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java

@@ -1,5 +1,6 @@
-package com.hxhq.business.utils;
+package com.hxhq.business.utils.lang;
 
+import com.hxhq.business.utils.JctUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/TemplateUtil.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/TemplateUtil.java

@@ -1,5 +1,6 @@
-package com.hxhq.business.utils;
+package com.hxhq.business.utils.lang;
 
+import com.hxhq.business.utils.JctUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java

@@ -6,7 +6,7 @@ import com.hxhq.business.domain.GyzjJcgj;
 import com.hxhq.business.domain.GyzjTz;
 import com.hxhq.business.dto.gyzj.DetailDto;
 import com.hxhq.business.enums.zykgl.ZjztEnum;
-import com.hxhq.business.utils.GyzjJcnrUtil;
+import com.hxhq.business.utils.lang.GyzjJcnrUtil;
 import com.hxhq.business.utils.pdf.PdfBaseUtil;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
 import com.hxhq.common.core.utils.StringUtils;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.enums.zykgl.ZjztEnum;
-import com.hxhq.business.utils.MjyJcnrUtil;
+import com.hxhq.business.utils.lang.MjyJcnrUtil;
 import com.hxhq.business.utils.pdf.PdfBaseUtil;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
 import com.hxhq.common.core.utils.StringUtils;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/SP001.java

@@ -1,20 +1,13 @@
 package com.hxhq.business.utils.pdf.template;
 
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hxhq.business.domain.*;
-import com.hxhq.business.utils.TemplateUtil;
 import com.hxhq.business.utils.pdf.PdfBaseUtil;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.api.model.LoginUser;
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfPCell;
-import com.itextpdf.text.pdf.PdfPTable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java

@@ -4,16 +4,12 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.hxhq.business.domain.StudyFormFill;
 import com.hxhq.business.domain.StudyFormFillJcgj;
 import com.hxhq.business.domain.StudyFormFillQmxx;
-import com.hxhq.business.domain.Template;
-import com.hxhq.business.utils.TemplateUtil;
+import com.hxhq.business.utils.lang.TemplateUtil;
 import com.hxhq.business.utils.pdf.PdfBaseUtil;
 import com.hxhq.business.utils.pdf.PdfExportUtil;
 import com.hxhq.common.core.utils.StringUtils;
-import com.hxhq.common.security.utils.SecurityUtils;
-import com.hxhq.system.api.model.LoginUser;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPCell;
@@ -21,7 +17,6 @@ import com.itextpdf.text.pdf.PdfPTable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.*;