Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
c1e0524c by 荆蔚杰
Options

字段调整

1 parent 955b194a
Inline Side-by-side
Showing 12 changed files with 73 additions and 44 deletions
...@@ -95,5 +95,9 @@ public class DgArchivesCatalogDO implements Serializable { ...@@ -95,5 +95,9 @@ public class DgArchivesCatalogDO implements Serializable {
95 @TableField("BZ") 95 @TableField("BZ")
96 private String bz; 96 private String bz;
97 97
98 98 /**
99 * 附件来源（1：业务附件，2：补录附件）
100 */
101 @TableField("FJLY")
102 private String fjly;
99 } 103 }
......
...@@ -93,6 +93,13 @@ public class AddDgArchivesCatalogRequest implements Serializable { ...@@ -93,6 +93,13 @@ public class AddDgArchivesCatalogRequest implements Serializable {
93 */ 93 */
94 @ApiModelProperty(name = "bz", value = "备注") 94 @ApiModelProperty(name = "bz", value = "备注")
95 private String bz; 95 private String bz;
96
97 /**
98 * 附件来源（1：业务附件，2：补录附件）
99 */
100 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
101 private String fjly;
102
96 /** 103 /**
97 * 文件访问地址列表 104 * 文件访问地址列表
98 */ 105 */
......
...@@ -93,5 +93,9 @@ public class DgArchivesCatalogDetailVO implements Serializable { ...@@ -93,5 +93,9 @@ public class DgArchivesCatalogDetailVO implements Serializable {
93 @ApiModelProperty(name = "bz", value = "备注") 93 @ApiModelProperty(name = "bz", value = "备注")
94 private String bz; 94 private String bz;
95 95
96 96 /**
97 * 附件来源（1：业务附件，2：补录附件）
98 */
99 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
100 private String fjly;
97 } 101 }
......
...@@ -95,6 +95,12 @@ public class DgArchivesCatalogListVO implements Serializable { ...@@ -95,6 +95,12 @@ public class DgArchivesCatalogListVO implements Serializable {
95 private String bz; 95 private String bz;
96 96
97 /** 97 /**
98 * 附件来源（1：业务附件，2：补录附件）
99 */
100 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
101 private String fjly;
102
103 /**
98 * 不动产单元 104 * 不动产单元
99 */ 105 */
100 @ApiModelProperty(name = "bdcdyDO",value = "不动产单元") 106 @ApiModelProperty(name = "bdcdyDO",value = "不动产单元")
......
...@@ -95,5 +95,9 @@ public class DgArchivesCatalogSearchRequest extends PageInfo implements Serializ ...@@ -95,5 +95,9 @@ public class DgArchivesCatalogSearchRequest extends PageInfo implements Serializ
95 @ApiModelProperty(name = "bz", value = "备注") 95 @ApiModelProperty(name = "bz", value = "备注")
96 private String bz; 96 private String bz;
97 97
98 98 /**
99 * 附件来源（1：业务附件，2：补录附件）
100 */
101 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
102 private String fjly;
99 } 103 }
......
...@@ -89,6 +89,12 @@ public class DgArchivesCatalogWithFileVO implements Serializable { ...@@ -89,6 +89,12 @@ public class DgArchivesCatalogWithFileVO implements Serializable {
89 private String bz; 89 private String bz;
90 90
91 /** 91 /**
92 * 附件来源（1：业务附件，2：补录附件）
93 */
94 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
95 private String fjly;
96
97 /**
92 * 附件对象集合 98 * 附件对象集合
93 */ 99 */
94 @ApiModelProperty(name = "dgFileDOS", value = "附件对象集合") 100 @ApiModelProperty(name = "dgFileDOS", value = "附件对象集合")
......
...@@ -93,5 +93,9 @@ public class UpdateDgArchivesCatalogRequest implements Serializable { ...@@ -93,5 +93,9 @@ public class UpdateDgArchivesCatalogRequest implements Serializable {
93 @ApiModelProperty(name = "bz", value = "备注") 93 @ApiModelProperty(name = "bz", value = "备注")
94 private String bz; 94 private String bz;
95 95
96 96 /**
97 * 附件来源（1：业务附件，2：补录附件）
98 */
99 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
100 private String fjly;
97 } 101 }
......
...@@ -65,11 +65,6 @@ public class DgFileDO implements Serializable { ...@@ -65,11 +65,6 @@ public class DgFileDO implements Serializable {
65 */ 65 */
66 @TableField("FJSIZE") 66 @TableField("FJSIZE")
67 private String fjsize; 67 private String fjsize;
68 /**
69 * 附件来源（1：业务附件，2：补录附件）
70 */
71 @TableField("FJLY")
72 private String fjly;
73 68
74 /** 69 /**
75 * 序号 70 * 序号
......
...@@ -60,11 +60,6 @@ public class AddDgFileRequest implements Serializable { ...@@ -60,11 +60,6 @@ public class AddDgFileRequest implements Serializable {
60 */ 60 */
61 @ApiModelProperty(name = "fjsize", value = "附件大小") 61 @ApiModelProperty(name = "fjsize", value = "附件大小")
62 private String fjsize; 62 private String fjsize;
63 /**
64 * 附件来源（1：业务附件，2：补录附件）
65 */
66 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
67 private String fjly;
68 63
69 /** 64 /**
70 * 序号 65 * 序号
......
...@@ -28,10 +28,10 @@ public interface DgFileMapper extends BaseMapper<DgFileDO> { ...@@ -28,10 +28,10 @@ public interface DgFileMapper extends BaseMapper<DgFileDO> {
28 */ 28 */
29 List<DgCatalogWithFileVO> getFileList(@Param("bsmArchive") String bsmArchive); 29 List<DgCatalogWithFileVO> getFileList(@Param("bsmArchive") String bsmArchive);
30 30
31 /** 31 // /**
32 * 更新排序 32 // * 更新排序
33 * @param requests 33 // * @param requests
34 * @return 34 // * @return
35 */ 35 // */
36 int updateFileSort(@Param("requests") List<UpdateDgFileRequest> requests); 36 // int updateFileSort(@Param("requests") List<UpdateDgFileRequest> requests);
37 } 37 }
......
...@@ -4,23 +4,24 @@ ...@@ -4,23 +4,24 @@
4 4
5 <!-- 通用查询映射结果 --> 5 <!-- 通用查询映射结果 -->
6 <resultMap id="BaseResultMap" type="com.pashanhoo.catalog.entity.DgArchivesCatalogDO"> 6 <resultMap id="BaseResultMap" type="com.pashanhoo.catalog.entity.DgArchivesCatalogDO">
7 <id column="BSM_CATALOG" property="bsmCatalog" /> 7 <result column="bsm_catalog" property="bsmCatalog"/>
8 <result column="BSM_ARCHIVES" property="bsmArchives" /> 8 <result column="bsm_archives" property="bsmArchives"/>
9 <result column="XH" property="xh" /> 9 <result column="xh" property="xh"/>
10 <result column="WJBM" property="wjbm" /> 10 <result column="wjbm" property="wjbm"/>
11 <result column="WJMC" property="wjmc" /> 11 <result column="wjmc" property="wjmc"/>
12 <result column="CLLXBM" property="cllxbm" /> 12 <result column="cllxbm" property="cllxbm"/>
13 <result column="CLLXMC" property="cllxmc" /> 13 <result column="cllxmc" property="cllxmc"/>
14 <result column="YS" property="ys" /> 14 <result column="ys" property="ys"/>
15 <result column="YH" property="yh" /> 15 <result column="yh" property="yh"/>
16 <result column="FS" property="fs" /> 16 <result column="fs" property="fs"/>
17 <result column="WH" property="wh" /> 17 <result column="wh" property="wh"/>
18 <result column="BZ" property="bz" /> 18 <result column="bz" property="bz"/>
19 <result column="fjly" property="fjly"/>
19 </resultMap> 20 </resultMap>
20 21
21 <!-- 通用查询结果列 --> 22 <!-- 通用查询结果列 -->
22 <sql id="Base_Column_List"> 23 <sql id="Base_Column_List">
23 BSM_CATALOG, BSM_ARCHIVES, XH, WJBM, WJMC, CLLXBM, CLLXMC, YS, YH, FS, WH, BZ 24 BSM_CATALOG, BSM_ARCHIVES, XH, WJBM, WJMC, CLLXBM, CLLXMC, YS, YH, FS, WH, BZ,FJLY
24 </sql> 25 </sql>
25 26
26 <resultMap id="getCatalogAndBDCDY" type="com.pashanhoo.catalog.entity.vo.DgArchivesCatalogListVO"> 27 <resultMap id="getCatalogAndBDCDY" type="com.pashanhoo.catalog.entity.vo.DgArchivesCatalogListVO">
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
36 <result column="fs" property="fs"/> 37 <result column="fs" property="fs"/>
37 <result column="wh" property="wh"/> 38 <result column="wh" property="wh"/>
38 <result column="bz" property="bz"/> 39 <result column="bz" property="bz"/>
40 <result column="FJLY" property="fjly"/>
39 <association property="bdcdyDO" javaType="com.pashanhoo.bdcdy.entity.DgBdcdyDO"> 41 <association property="bdcdyDO" javaType="com.pashanhoo.bdcdy.entity.DgBdcdyDO">
40 <result column="BSM_BDCDY" property="bsmBdcdy"/> 42 <result column="BSM_BDCDY" property="bsmBdcdy"/>
41 <result column="BSM_ARCHIVES" property="bsmArchives"/> 43 <result column="BSM_ARCHIVES" property="bsmArchives"/>
......
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
3 <mapper namespace="com.pashanhoo.file.mapper.DgFileMapper"> 3 <mapper namespace="com.pashanhoo.file.mapper.DgFileMapper">
4 <!-- 通用查询映射结果 --> 4 <!-- 通用查询映射结果 -->
5 <resultMap id="BaseResultMap" type="com.pashanhoo.file.entity.DgFileDO"> 5 <resultMap id="BaseResultMap" type="com.pashanhoo.file.entity.DgFileDO">
6 <id column="BSM_FILE" property="bsmFile"/> 6 <result column="bsm_file" property="bsmFile"/>
7 <result column="BSM_CATALOG" property="bsmCatalog"/> 7 <result column="bsm_catalog" property="bsmCatalog"/>
8 <result column="KZM" property="kzm"/> 8 <result column="kzm" property="kzm"/>
9 <result column="SCRQ" property="scrq"/> 9 <result column="scrq" property="scrq"/>
10 <result column="SCR" property="scr"/> 10 <result column="scr" property="scr"/>
11 <result column="FJURL" property="fjurl"/> 11 <result column="fjurl" property="fjurl"/>
12 <result column="FJSIZE" property="fjsize"/> 12 <result column="fjsize" property="fjsize"/>
13 <result column="xh" property="xh"/>
13 </resultMap> 14 </resultMap>
14 15
15 <!-- 通用查询结果列 --> 16 <!-- 通用查询结果列 -->
...@@ -20,7 +21,8 @@ ...@@ -20,7 +21,8 @@
20 SCRQ, 21 SCRQ,
21 SCR, 22 SCR,
22 FJURL, 23 FJURL,
23 FJSIZE 24 FJSIZE,
25 XH
24 </sql> 26 </sql>
25 27
26 <resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO"> 28 <resultMap id="result" type="com.pashanhoo.file.entity.vo.DgCatalogWithFileVO">
...@@ -50,7 +52,7 @@ ...@@ -50,7 +52,7 @@
50 order by DAC.XH 52 order by DAC.XH
51 </select> 53 </select>
52 54
53 <update id="updateFileSort"> 55 <!--<update id="updateFileSort">-->
54 update DG_FILE set 56 <!-- update DG_FILE set-->
55 </update> 57 <!--</update>-->
56 </mapper> 58 </mapper>
......