af29ba3a by 荆蔚杰

字段调整

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