af29ba3a by 荆蔚杰

字段调整

1 parent a494b718
...@@ -30,8 +30,8 @@ public class DgCatalogWithFileVO implements Serializable { ...@@ -30,8 +30,8 @@ public class DgCatalogWithFileVO implements Serializable {
30 /** 30 /**
31 * 序号 31 * 序号
32 */ 32 */
33 @ApiModelProperty(name = "xh", value = "序号") 33 @ApiModelProperty(name = "catalogXh", value = "目录序号")
34 private Integer xh; 34 private Integer catalogXh;
35 35
36 /** 36 /**
37 * 档案文件信息列表VO 37 * 档案文件信息列表VO
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO"> 28 <resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO">
29 <result column="bsm_catalog" property="bsmCatalog"/> 29 <result column="bsm_catalog" property="bsmCatalog"/>
30 <result column="wjmc" property="wjmc"/> 30 <result column="wjmc" property="wjmc"/>
31 <result column="xh" property="xh"/> 31 <result column="catalogXh" property="catalogXh"/>
32 <collection property="fileLists" ofType="com.pashanhoo.file.entity.vo.DgFileListVO"> 32 <collection property="fileLists" ofType="com.pashanhoo.file.entity.vo.DgFileListVO">
33 <result column="bsm_file" property="bsmFile"/> 33 <result column="bsm_file" property="bsmFile"/>
34 <result column="bsm_catalog" property="bsmCatalog"/> 34 <result column="bsm_catalog" property="bsmCatalog"/>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </resultMap> 42 </resultMap>
43 43
44 <select id="getFileList" resultMap="result"> 44 <select id="getFileList" resultMap="result">
45 select DF.*, DAC.XH, DAC.WJMC,DAC.BSM_CATALOG 45 select DF.*, DAC.XH as catalogXh, DAC.WJMC,DAC.BSM_CATALOG
46 from DG_FILE DF 46 from DG_FILE DF
47 join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG 47 join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG
48 <where> 48 <where>
......