Browse Source

feat:[模板导出]新增pdfsize

master
15881625488@163.com 2 months ago
parent
commit
b8f6a805b4
3 changed files with 24 additions and 1 deletions
  1. +12
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
  2. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java
  3. +1
    -1
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

+ 12
- 0
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java View File

@ -143,6 +143,10 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false) @TableField(exist = false)
private Long templateDeptId; private Long templateDeptId;
/** 模板导出pdf纸张大小:a1-a10 */
@TableField(exist = false)
private String templatePdfSize;
/** 试验编号 */ /** 试验编号 */
@TableField(exist = false) @TableField(exist = false)
private String studySn; private String studySn;
@ -151,6 +155,14 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false) @TableField(exist = false)
private String studyMc; private String studyMc;
public String getTemplatePdfSize() {
return templatePdfSize;
}
public void setTemplatePdfSize(String templatePdfSize) {
this.templatePdfSize = templatePdfSize;
}
public Integer getProduct() { public Integer getProduct() {
return product; return product;
} }

+ 11
- 0
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java View File

@ -58,10 +58,21 @@ public class Template extends MpBaseEntity
/** 步骤库ids */ /** 步骤库ids */
private String stepGroupIds; private String stepGroupIds;
/** 导出pdf纸张大小:a1-a10 */
private String pdfSize;
/** 部门名称 */ /** 部门名称 */
@TableField(exist = false) @TableField(exist = false)
private String deptName; private String deptName;
public String getPdfSize() {
return pdfSize;
}
public void setPdfSize(String pdfSize) {
this.pdfSize = pdfSize;
}
public Integer getShowGc() { public Integer getShowGc() {
return showGc; return showGc;
} }

+ 1
- 1
hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml View File

@ -18,7 +18,7 @@
<select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormFill"> <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormFill">
select t.*,tm.name as templateMc,tm.name_en as templateMcEn,tm.sn as templateSn,tm.show_sn as templateShowSn,tm.dept_id as templateDeptId select t.*,tm.name as templateMc,tm.name_en as templateMcEn,tm.sn as templateSn,tm.show_sn as templateShowSn,tm.dept_id as templateDeptId
,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod,tm.product
,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod,tm.product,tm.pdf_size as templatePdfSize
FROM `t_study_form_fill` t FROM `t_study_form_fill` t
join t_template tm on tm.id=t.template_id join t_template tm on tm.id=t.template_id
join t_study ts on ts.id=t.study_id join t_study ts on ts.id=t.study_id

Loading…
Cancel
Save