eln_TD
/
eln_svr
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix：[代码规范]

master
15881625488@163.com 2 months ago
parent
3d377faa95
commit
6e9a63d461
11 changed files with 417 additions and 419 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java
  2. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java
  3. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMethodController.java
  4. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
  5. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
  6. +5
    -7
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Mbmjylqsqd.java
  7. +2
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java
  8. +2
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/Sp001.java

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java View File

@ -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<String,Object> map=new HashMap<String,Object>();
HashMap<String,Object> map=new HashMap<String,Object>(2);
//稽查轨迹
QueryWrapper<StudyFormFillJcgj> studyFormFillJcgjQueryWrapper = Wrappers.query();
studyFormFillJcgjQueryWrapper.eq("form_id",id);

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPlanController.java View File

@ -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<String,Object> map=new HashMap<String,Object>();
HashMap<String,Object> map=new HashMap<String,Object>(2);
//稽查轨迹
QueryWrapper<StudyFormPlanJcgj> studyFormPlanJcgjQueryWrapper = Wrappers.query();
studyFormPlanJcgjQueryWrapper.eq("form_id",id);

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMethodController.java View File

@ -96,7 +96,7 @@ public class StudyMethodController extends BaseController {
List<StudyMethodRead> list = studyMethodReadService.queryList(studyMethodId);
String exportStudyMethodFilePath = studyMethodFileUtil.exportStudyMethodFile(studyMethod, list);
Map<String, String> result = new HashMap<>();
Map<String, String> result = new HashMap<>(2);
result.put("fileUrl", exportStudyMethodFilePath);
return AjaxResult.success(result);
}

+ 3
- 3
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java View File

@ -1326,7 +1326,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
Long studyFormId = studyFormFill.getId();
// 生成/使用
String resource = studyFormFill.getResource();
Map<String, Gyzj> gyzjMap = new HashMap<>();
Map<String, Gyzj> gyzjMap = new HashMap<>(10);
List<Gyzj> gyzjList = new ArrayList<>();
LinkedList<GyzjJcgj> jcgjList = new LinkedList<>();
LinkedList<GyzjTz> tzList = new LinkedList<>();
@ -1405,7 +1405,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
if (gyzj != null) {
list.add(bh);
// 稽查轨迹
HashMap<String, String> formData = new HashMap<>();
HashMap<String, String> 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<String, String> formData = new HashMap<>();
HashMap<String, String> 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));

+ 3
- 3
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java View File

@ -1229,7 +1229,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
Long studyFormId = studyFormFill.getId();
// 生成/使用
String resource = studyFormFill.getResource();
Map<String, Mjy> mjyMap = new HashMap<>();
Map<String, Mjy> mjyMap = new HashMap<>(10);
List<Mjy> mjyList = new ArrayList<>();
LinkedList<MjyJcgj> jcgjList = new LinkedList<>();
LinkedList<MjyTz> tzList = new LinkedList<>();
@ -1308,7 +1308,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
if(mjy!=null){
list.add(bh);
// 稽查轨迹
HashMap<String, String> formData = new HashMap<>();
HashMap<String, String> 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<String, String> formData = new HashMap<>();
HashMap<String, String> 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));

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/MBMJYLQSQD.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Mbmjylqsqd.java View File

@ -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) +

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/SYWZPZJHB.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java View File

@ -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";
/**

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java → hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/Sp001.java View File

@ -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";
/**

Write Preview
Loading…
Cancel
Save