diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java index 53fbc89..c9ba4fc 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java @@ -134,10 +134,6 @@ public class StudyFormApply extends MpBaseEntity @TableField(exist = false) private String templateExportMethod; - /** 模板所属部门/学科 */ - @TableField(exist = false) - private Long templateDeptId; - /** 试验编号 */ @TableField(exist = false) private String studySn; @@ -314,14 +310,6 @@ public class StudyFormApply extends MpBaseEntity this.templateSn = templateSn; } - public Long getTemplateDeptId() { - return templateDeptId; - } - - public void setTemplateDeptId(Long templateDeptId) { - this.templateDeptId = templateDeptId; - } - public void setStudyId(Long studyId) { this.studyId = studyId; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java index 9213999..f8e3ec8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java @@ -154,10 +154,6 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private Integer product; - /** 模板所属部门/学科 */ - @TableField(exist = false) - private Long templateDeptId; - /** 模板导出pdf纸张大小:a1-a10 */ @TableField(exist = false) private String templatePdfSize; @@ -390,14 +386,6 @@ public class StudyFormFill extends MpBaseEntity this.studyMc = studyMc; } - public Long getTemplateDeptId() { - return templateDeptId; - } - - public void setTemplateDeptId(Long templateDeptId) { - this.templateDeptId = templateDeptId; - } - public String getQmyy() { return qmyy; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java index 880852f..ce6fa7e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java @@ -112,10 +112,6 @@ public class StudyFormPlan extends MpBaseEntity @TableField(exist = false) private String templateExportMethod; - /** 模板所属部门/学科 */ - @TableField(exist = false) - private Long templateDeptId; - /** 试验编号 */ @TableField(exist = false) private String studySn; @@ -132,14 +128,6 @@ public class StudyFormPlan extends MpBaseEntity this.submittedCodes = submittedCodes; } - public Long getTemplateDeptId() { - return templateDeptId; - } - - public void setTemplateDeptId(Long templateDeptId) { - this.templateDeptId = templateDeptId; - } - public String getTemplateMcEn() { return templateMcEn; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java index d46041d..f8179a7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java @@ -111,10 +111,6 @@ public class StudyFormPre extends MpBaseEntity @TableField(exist = false) private String templateSn; - /** 模板所属部门/学科 */ - @TableField(exist = false) - private Long templateDeptId; - /** 试验编号 */ @TableField(exist = false) private String studySn; @@ -211,14 +207,6 @@ public class StudyFormPre extends MpBaseEntity this.studyMc = studyMc; } - public Long getTemplateDeptId() { - return templateDeptId; - } - - public void setTemplateDeptId(Long templateDeptId) { - this.templateDeptId = templateDeptId; - } - public String getTemplateSn() { return templateSn; } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml index d7c5f76..a906b46 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml @@ -5,7 +5,7 @@ - select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId + select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn ,ss.leader as subjectLeader,t.sfbl,tm.show_gc,tm.show_blxjsh,t.blxjshzt FROM `t_study_form_fill` t join t_template tm on tm.id=t.template_id @@ -17,7 +17,7 @@ select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.fzrsh,t.sjshry_id - ,t.fzrshzt,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId + ,t.fzrshzt,tm.name as templateMc,tm.sn as templateSn FROM `t_study_form_pre` t join t_template tm on tm.id=t.template_id @@ -16,7 +16,7 @@