Browse Source

feat: [表单管理] 删除无用字段

master
memorylkf 3 weeks ago
parent
commit
2c8e8a1233
8 changed files with 7 additions and 55 deletions
  1. +0
    -12
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java
  2. +0
    -12
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
  3. +0
    -12
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java
  4. +0
    -12
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java
  5. +2
    -2
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
  6. +2
    -2
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml
  7. +1
    -1
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
  8. +2
    -2
      hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml

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

@ -134,10 +134,6 @@ public class StudyFormApply extends MpBaseEntity
@TableField(exist = false) @TableField(exist = false)
private String templateExportMethod; private String templateExportMethod;
/** 模板所属部门/学科 */
@TableField(exist = false)
private Long templateDeptId;
/** 试验编号 */ /** 试验编号 */
@TableField(exist = false) @TableField(exist = false)
private String studySn; private String studySn;
@ -314,14 +310,6 @@ public class StudyFormApply extends MpBaseEntity
this.templateSn = templateSn; this.templateSn = templateSn;
} }
public Long getTemplateDeptId() {
return templateDeptId;
}
public void setTemplateDeptId(Long templateDeptId) {
this.templateDeptId = templateDeptId;
}
public void setStudyId(Long studyId) public void setStudyId(Long studyId)
{ {
this.studyId = studyId; this.studyId = studyId;

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

@ -154,10 +154,6 @@ public class StudyFormFill extends MpBaseEntity
@TableField(exist = false) @TableField(exist = false)
private Integer product; private Integer product;
/** 模板所属部门/学科 */
@TableField(exist = false)
private Long templateDeptId;
/** 模板导出pdf纸张大小:a1-a10 */ /** 模板导出pdf纸张大小:a1-a10 */
@TableField(exist = false) @TableField(exist = false)
private String templatePdfSize; private String templatePdfSize;
@ -390,14 +386,6 @@ public class StudyFormFill extends MpBaseEntity
this.studyMc = studyMc; this.studyMc = studyMc;
} }
public Long getTemplateDeptId() {
return templateDeptId;
}
public void setTemplateDeptId(Long templateDeptId) {
this.templateDeptId = templateDeptId;
}
public String getQmyy() { public String getQmyy() {
return qmyy; return qmyy;
} }

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

@ -112,10 +112,6 @@ public class StudyFormPlan extends MpBaseEntity
@TableField(exist = false) @TableField(exist = false)
private String templateExportMethod; private String templateExportMethod;
/** 模板所属部门/学科 */
@TableField(exist = false)
private Long templateDeptId;
/** 试验编号 */ /** 试验编号 */
@TableField(exist = false) @TableField(exist = false)
private String studySn; private String studySn;
@ -132,14 +128,6 @@ public class StudyFormPlan extends MpBaseEntity
this.submittedCodes = submittedCodes; this.submittedCodes = submittedCodes;
} }
public Long getTemplateDeptId() {
return templateDeptId;
}
public void setTemplateDeptId(Long templateDeptId) {
this.templateDeptId = templateDeptId;
}
public String getTemplateMcEn() { public String getTemplateMcEn() {
return templateMcEn; return templateMcEn;
} }

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

@ -111,10 +111,6 @@ public class StudyFormPre extends MpBaseEntity
@TableField(exist = false) @TableField(exist = false)
private String templateSn; private String templateSn;
/** 模板所属部门/学科 */
@TableField(exist = false)
private Long templateDeptId;
/** 试验编号 */ /** 试验编号 */
@TableField(exist = false) @TableField(exist = false)
private String studySn; private String studySn;
@ -211,14 +207,6 @@ public class StudyFormPre extends MpBaseEntity
this.studyMc = studyMc; this.studyMc = studyMc;
} }
public Long getTemplateDeptId() {
return templateDeptId;
}
public void setTemplateDeptId(Long templateDeptId) {
this.templateDeptId = templateDeptId;
}
public String getTemplateSn() { public String getTemplateSn() {
return templateSn; return templateSn;
} }

+ 2
- 2
hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml View File

@ -5,7 +5,7 @@
<mapper namespace="com.hxhq.business.mapper.StudyFormApplyMapper"> <mapper namespace="com.hxhq.business.mapper.StudyFormApplyMapper">
<select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormApplyListDto"> <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormApplyListDto">
select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,t.sfbl,t.sywzmc,t.xynd,t.xysj, select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,t.sfbl,t.sywzmc,t.xynd,t.xysj,
tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId,ts.sn as sySn,sd.dept_name as bmName
tm.name as templateMc,tm.sn as templateSn,ts.sn as sySn,sd.dept_name as bmName
FROM `t_study_form_apply` t FROM `t_study_form_apply` t
join t_template tm on tm.id=t.template_id join t_template tm on tm.id=t.template_id
left join t_study ts on ts.id=t.sy_id left join t_study ts on ts.id=t.sy_id
@ -18,7 +18,7 @@
</select> </select>
<select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormApply"> <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormApply">
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
,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod ,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod
FROM `t_study_form_apply` t FROM `t_study_form_apply` t
join t_template tm on tm.id=t.template_id join t_template tm on tm.id=t.template_id

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

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hxhq.business.mapper.StudyFormFillMapper"> <mapper namespace="com.hxhq.business.mapper.StudyFormFillMapper">
<select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormFillListDto"> <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormFillListDto">
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 ,ss.leader as subjectLeader,t.sfbl,tm.show_gc,tm.show_blxjsh,t.blxjshzt
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
@ -17,7 +17,7 @@
</select> </select>
<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
,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,tm.show_yjcc as templateShowYjcc,ts.type as studyType,tm.show_blxjsh tm.pdf_size as templatePdfSize,tm.show_yjcc as templateShowYjcc,ts.type as studyType,tm.show_blxjsh
FROM `t_study_form_fill` t FROM `t_study_form_fill` t

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

@ -15,7 +15,7 @@
</select> </select>
<select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPlan"> <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPlan">
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
,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod ,ts.sn as studySn,ts.name as studyMc,tm.export_class as templateExportClass,tm.export_method as templateExportMethod
FROM `t_study_form_plan` t FROM `t_study_form_plan` t
join t_template tm on tm.id=t.template_id join t_template tm on tm.id=t.template_id

+ 2
- 2
hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml View File

@ -5,7 +5,7 @@
<mapper namespace="com.hxhq.business.mapper.StudyFormPreMapper"> <mapper namespace="com.hxhq.business.mapper.StudyFormPreMapper">
<select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormPreListDto"> <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormPreListDto">
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 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 FROM `t_study_form_pre` t
join t_template tm on tm.id=t.template_id join t_template tm on tm.id=t.template_id
<if test="ew.sqlSegment != '' and ew.sqlSegment != null"> <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
@ -16,7 +16,7 @@
</select> </select>
<select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPre"> <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPre">
select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
select t.*,tm.name as templateMc,tm.sn as templateSn
,ts.sn as studySn,ts.name as studyMc ,ts.sn as studySn,ts.name as studyMc
FROM `t_study_form_pre` t FROM `t_study_form_pre` t
join t_template tm on tm.id=t.template_id join t_template tm on tm.id=t.template_id

Loading…
Cancel
Save