diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java index 0b65eec..8bd5082 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java @@ -91,7 +91,7 @@ public class StudyFormFillController extends BaseController { @GetMapping("/jcgjqmxxList") @RequiresPermissions(value = {"business:studyFormFill:xq", "business:nonTrialFormFill:xq", "business:drugFormFill:xq"}, logical = Logical.OR) public AjaxResult jcgjqmxxList(Integer jcgjlx,Long id) { - HashMap map=new HashMap(); + HashMap map=new HashMap(2); //稽查轨迹 QueryWrapper studyFormFillJcgjQueryWrapper = Wrappers.query(); studyFormFillJcgjQueryWrapper.eq("form_id",id); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java index 9b1e186..17da503 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java @@ -90,7 +90,7 @@ public class StudyFormPlanController extends BaseController @GetMapping("/jcgjqmxxList") @RequiresPermissions(value = {"business:studyFormPlan:xq", "business:nonTrialFormPlan:xq", "business:drugFormPlan:xq"}, logical = Logical.OR) public AjaxResult jcgjqmxxList(Integer jcgjlx,Long id) { - HashMap map=new HashMap(); + HashMap map=new HashMap(2); //稽查轨迹 QueryWrapper studyFormPlanJcgjQueryWrapper = Wrappers.query(); studyFormPlanJcgjQueryWrapper.eq("form_id",id); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMethodController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMethodController.java index 386f082..a56a068 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMethodController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMethodController.java @@ -96,7 +96,7 @@ public class StudyMethodController extends BaseController { List list = studyMethodReadService.queryList(studyMethodId); String exportStudyMethodFilePath = studyMethodFileUtil.exportStudyMethodFile(studyMethod, list); - Map result = new HashMap<>(); + Map result = new HashMap<>(2); result.put("fileUrl", exportStudyMethodFilePath); return AjaxResult.success(result); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index ea15df0..21e7de2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -1326,7 +1326,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Long studyFormId = studyFormFill.getId(); // 生成/使用 String resource = studyFormFill.getResource(); - Map gyzjMap = new HashMap<>(); + Map gyzjMap = new HashMap<>(10); List gyzjList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); @@ -1405,7 +1405,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzj != null) { list.add(bh); // 稽查轨迹 - HashMap formData = new HashMap<>(); + HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); formData.put("存储条件", studyFormFillCc.getCctj()); jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); @@ -1430,7 +1430,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzj != null) { list.add(bh); // 稽查轨迹 - HashMap formData = new HashMap<>(); + HashMap formData = new HashMap<>(2); formData.put("处置方式", studyFormFillCz.getCzfs()); formData.put("处置量", gyzj.getKc() + gyzj.getKcdw()); jcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index 1249f1e..00f693f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -1229,7 +1229,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Long studyFormId = studyFormFill.getId(); // 生成/使用 String resource = studyFormFill.getResource(); - Map mjyMap = new HashMap<>(); + Map mjyMap = new HashMap<>(10); List mjyList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); @@ -1308,7 +1308,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if(mjy!=null){ list.add(bh); // 稽查轨迹 - HashMap formData = new HashMap<>(); + HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); formData.put("存储条件", studyFormFillCc.getCctj()); jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); @@ -1333,7 +1333,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if(mjy!=null){ list.add(bh); // 稽查轨迹 - HashMap formData = new HashMap<>(); + HashMap formData = new HashMap<>(2); formData.put("处置方式", studyFormFillCz.getCzfs()); formData.put("处置量", mjy.getKc() + mjy.getKcdw()); jcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/MBMJYLQSQD.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Mbmjylqsqd.java similarity index 96% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/MBMJYLQSQD.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Mbmjylqsqd.java index 7c05ae1..374749b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/MBMJYLQSQD.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Mbmjylqsqd.java @@ -12,9 +12,6 @@ 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; @@ -30,8 +27,8 @@ import java.util.Map; * * @author tanfei */ -public class MBMJYLQSQD { - private static final Logger logger = LoggerFactory.getLogger(MBMJYLQSQD.class.getName()); +public class Mbmjylqsqd { + private static final Logger logger = LoggerFactory.getLogger(Mbmjylqsqd.class.getName()); public String language = "zh"; /** @@ -69,7 +66,8 @@ public class MBMJYLQSQD { formData2.put(getName("需要量"), (StringUtils.isNoneBlank(bdnr.getString("xyl")) ? bdnr.getString("xyl") : "") + TemplateBaseUtil.getCheck("_xyl", zdgxjl) + TemplateBaseUtil.getFh("_xyl", fhyjjl)); formData2.put(getName("需要时间"), (StringUtils.isNoneBlank(bdnr.getString("xysj")) ? bdnr.getString("xysj") : "") + TemplateBaseUtil.getCheck("_xysj", zdgxjl) + TemplateBaseUtil.getFh("_xysj", fhyjjl)); formData2.put(getName("预计归还时间"), (StringUtils.isNoneBlank(bdnr.getString("yjghsj")) ? bdnr.getString("yjghsj") : "") + TemplateBaseUtil.getCheck("_yjghsj", zdgxjl) + TemplateBaseUtil.getFh("_yjghsj", fhyjjl)); - if(StringUtils.isNoneBlank(bdnr.getString("dwzsOther"))){ + String dwzsOther="dwzsOther"; + if(StringUtils.isNoneBlank(bdnr.getString(dwzsOther))){ formData2.put(getName("动物种属"), getName("其他")+ TemplateBaseUtil.getCheck("_dwzs", zdgxjl) + TemplateBaseUtil.getFh("_dwzs", fhyjjl) + (StringUtils.isNoneBlank(bdnr.getString("dwzsOther")) ? bdnr.getString("dwzsOther") : "") + TemplateBaseUtil.getCheck("_dwzsOther", zdgxjl) + TemplateBaseUtil.getFh("_dwzsOther", fhyjjl)); @@ -77,7 +75,7 @@ public class MBMJYLQSQD { formData2.put(getName("动物种属"), (StringUtils.isNoneBlank(bdnr.getString("dwzs")) ? bdnr.getString("dwzs") : "") + TemplateBaseUtil.getCheck("_dwzs", zdgxjl) + TemplateBaseUtil.getFh("_dwzs", fhyjjl)); } formData2.put(getName("动物平均体重"), (StringUtils.isNoneBlank(bdnr.getString("dwpjtz")) ? bdnr.getString("dwpjtz") : "") + TemplateBaseUtil.getCheck("_dwpjtz", zdgxjl) + TemplateBaseUtil.getFh("_dwpjtz", fhyjjl)); - if(StringUtils.isNoneBlank(bdnr.getString("dwslOther"))) { + if(StringUtils.isNoneBlank(bdnr.getString(dwzsOther))) { formData2.put(getName("动物数量"), (StringUtils.isNoneBlank(bdnr.getString("dwsl")) ? bdnr.getString("dwsl") : "") + TemplateBaseUtil.getCheck("_dwsl", zdgxjl) + TemplateBaseUtil.getFh("_dwsl", fhyjjl)+ getName("其他")+ TemplateBaseUtil.getCheck("_dwslUnit", zdgxjl) + TemplateBaseUtil.getFh("_dwslUnit", fhyjjl) + diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/SYWZPZJHB.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java similarity index 99% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/SYWZPZJHB.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java index b436c75..4c260c5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/SYWZPZJHB.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java @@ -30,8 +30,8 @@ import java.util.Map; * * @author tanfei */ -public class SYWZPZJHB { - private static final Logger logger = LoggerFactory.getLogger(SYWZPZJHB.class.getName()); +public class Sywzpzjhb { + private static final Logger logger = LoggerFactory.getLogger(Sywzpzjhb.class.getName()); public String language = "zh"; /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/Sp001.java similarity index 99% rename from hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java rename to hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/Sp001.java index 7b125db..80add0f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/Sp001.java @@ -23,8 +23,8 @@ import java.util.List; * * @author tanfei */ -public class SP001 { - private static final Logger logger = LoggerFactory.getLogger(SP001.class.getName()); +public class Sp001 { + private static final Logger logger = LoggerFactory.getLogger(Sp001.class.getName()); public String language = "zh"; /**