c1e0524c by 荆蔚杰

字段调整

1 parent 955b194a
......@@ -95,5 +95,9 @@ public class DgArchivesCatalogDO implements Serializable {
@TableField("BZ")
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@TableField("FJLY")
private String fjly;
}
......
......@@ -93,6 +93,13 @@ public class AddDgArchivesCatalogRequest implements Serializable {
*/
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
/**
* 文件访问地址列表
*/
......
......@@ -93,5 +93,9 @@ public class DgArchivesCatalogDetailVO implements Serializable {
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
}
......
......@@ -95,6 +95,12 @@ public class DgArchivesCatalogListVO implements Serializable {
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
/**
* 不动产单元
*/
@ApiModelProperty(name = "bdcdyDO",value = "不动产单元")
......
......@@ -95,5 +95,9 @@ public class DgArchivesCatalogSearchRequest extends PageInfo implements Serializ
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
}
......
......@@ -89,6 +89,12 @@ public class DgArchivesCatalogWithFileVO implements Serializable {
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
/**
* 附件对象集合
*/
@ApiModelProperty(name = "dgFileDOS", value = "附件对象集合")
......
......@@ -93,5 +93,9 @@ public class UpdateDgArchivesCatalogRequest implements Serializable {
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
}
......
......@@ -65,11 +65,6 @@ public class DgFileDO implements Serializable {
*/
@TableField("FJSIZE")
private String fjsize;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@TableField("FJLY")
private String fjly;
/**
* 序号
......
......@@ -60,11 +60,6 @@ public class AddDgFileRequest implements Serializable {
*/
@ApiModelProperty(name = "fjsize", value = "附件大小")
private String fjsize;
/**
* 附件来源(1:业务附件,2:补录附件)
*/
@ApiModelProperty(name = "fjly", value = "附件来源(1:业务附件,2:补录附件)")
private String fjly;
/**
* 序号
......
......@@ -28,10 +28,10 @@ public interface DgFileMapper extends BaseMapper<DgFileDO> {
*/
List<DgCatalogWithFileVO> getFileList(@Param("bsmArchive") String bsmArchive);
/**
* 更新排序
* @param requests
* @return
*/
int updateFileSort(@Param("requests") List<UpdateDgFileRequest> requests);
// /**
// * 更新排序
// * @param requests
// * @return
// */
// int updateFileSort(@Param("requests") List<UpdateDgFileRequest> requests);
}
......
......@@ -4,23 +4,24 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.pashanhoo.catalog.entity.DgArchivesCatalogDO">
<id column="BSM_CATALOG" property="bsmCatalog" />
<result column="BSM_ARCHIVES" property="bsmArchives" />
<result column="XH" property="xh" />
<result column="WJBM" property="wjbm" />
<result column="WJMC" property="wjmc" />
<result column="CLLXBM" property="cllxbm" />
<result column="CLLXMC" property="cllxmc" />
<result column="YS" property="ys" />
<result column="YH" property="yh" />
<result column="FS" property="fs" />
<result column="WH" property="wh" />
<result column="BZ" property="bz" />
<result column="bsm_catalog" property="bsmCatalog"/>
<result column="bsm_archives" property="bsmArchives"/>
<result column="xh" property="xh"/>
<result column="wjbm" property="wjbm"/>
<result column="wjmc" property="wjmc"/>
<result column="cllxbm" property="cllxbm"/>
<result column="cllxmc" property="cllxmc"/>
<result column="ys" property="ys"/>
<result column="yh" property="yh"/>
<result column="fs" property="fs"/>
<result column="wh" property="wh"/>
<result column="bz" property="bz"/>
<result column="fjly" property="fjly"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
BSM_CATALOG, BSM_ARCHIVES, XH, WJBM, WJMC, CLLXBM, CLLXMC, YS, YH, FS, WH, BZ
BSM_CATALOG, BSM_ARCHIVES, XH, WJBM, WJMC, CLLXBM, CLLXMC, YS, YH, FS, WH, BZ,FJLY
</sql>
<resultMap id="getCatalogAndBDCDY" type="com.pashanhoo.catalog.entity.vo.DgArchivesCatalogListVO">
......@@ -36,6 +37,7 @@
<result column="fs" property="fs"/>
<result column="wh" property="wh"/>
<result column="bz" property="bz"/>
<result column="FJLY" property="fjly"/>
<association property="bdcdyDO" javaType="com.pashanhoo.bdcdy.entity.DgBdcdyDO">
<result column="BSM_BDCDY" property="bsmBdcdy"/>
<result column="BSM_ARCHIVES" property="bsmArchives"/>
......
......@@ -3,13 +3,14 @@
<mapper namespace="com.pashanhoo.file.mapper.DgFileMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.pashanhoo.file.entity.DgFileDO">
<id column="BSM_FILE" property="bsmFile"/>
<result column="BSM_CATALOG" property="bsmCatalog"/>
<result column="KZM" property="kzm"/>
<result column="SCRQ" property="scrq"/>
<result column="SCR" property="scr"/>
<result column="FJURL" property="fjurl"/>
<result column="FJSIZE" property="fjsize"/>
<result column="bsm_file" property="bsmFile"/>
<result column="bsm_catalog" property="bsmCatalog"/>
<result column="kzm" property="kzm"/>
<result column="scrq" property="scrq"/>
<result column="scr" property="scr"/>
<result column="fjurl" property="fjurl"/>
<result column="fjsize" property="fjsize"/>
<result column="xh" property="xh"/>
</resultMap>
<!-- 通用查询结果列 -->
......@@ -20,7 +21,8 @@
SCRQ,
SCR,
FJURL,
FJSIZE
FJSIZE,
XH
</sql>
<resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO">
......@@ -50,7 +52,7 @@
order by DAC.XH
</select>
<update id="updateFileSort">
update DG_FILE set
</update>
<!--<update id="updateFileSort">-->
<!-- update DG_FILE set-->
<!--</update>-->
</mapper>
......