diff --git a/fill-manager/db/module.sql b/fill-manager/db/module.sql index d5d4fe203815b8cf52df8b30f6cf9c0dd8fea6ab..d4ba83866a5ba935340d6d921146dbaa41dde0ec 100644 --- a/fill-manager/db/module.sql +++ b/fill-manager/db/module.sql @@ -136,6 +136,7 @@ CREATE TABLE mortals_xhx_pubdatum `sort` int(4) COMMENT '鎺掑簭', `fileName` varchar(255) COMMENT '濉崟鐨勯檮浠跺悕绉�', `fileUrl` varchar(255) COMMENT '濉崟鐨勯檮浠朵笅杞藉湴鍧€', + `filePreViewUrl` varchar(255) COMMENT '棰勮鍦板潃', `sampleName` varchar(255) COMMENT '鏍疯〃鍚嶇О', `samplePath` varchar(255) COMMENT '鏍疯〃鍦板潃', `templateName` varchar(255) COMMENT '妯℃澘鍚嶇О', diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumInfo.java b/fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumInfo.java index 08b2bcc74b5078318255ff559cf723ef07881b85..c0f79b5e6b5af22bac2f645c9c6484771fa419df 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumInfo.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumInfo.java @@ -62,6 +62,10 @@ public class MatterDatumInfo { * 濉崟鐨勯檮浠朵笅杞藉湴鍧€ */ private String fileUrl; + /** + * 闄勪欢棰勮鍦板潃 + */ + private String filePreViewUrl; /** * 鏍疯〃鍚嶇О diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java b/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java index 2048248ada226f3a450511d88593eb1c626bfcd4..8b39a78b7d146a5fe4521380d25b8c30e89d7877 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java @@ -10,7 +10,7 @@ import com.mortals.xhx.module.pubdatum.model.vo.PubdatumVo; * 浜嬮」鏉愭枡鍏叡搴撳疄浣撳璞� * * @author zxfei - * @date 2022-12-02 + * @date 2023-01-06 */ public class PubdatumEntity extends PubdatumVo { @@ -56,6 +56,10 @@ public class PubdatumEntity extends PubdatumVo { * 濉崟鐨勯檮浠朵笅杞藉湴鍧€ */ private String fileUrl; + /** + * 棰勮鍦板潃 + */ + private String filePreViewUrl; /** * 鏍疯〃鍚嶇О */ @@ -224,6 +228,20 @@ public class PubdatumEntity extends PubdatumVo { public void setFileUrl(String fileUrl){ this.fileUrl = fileUrl; } + /** + * 鑾峰彇 棰勮鍦板潃 + * @return String + */ + public String getFilePreViewUrl(){ + return filePreViewUrl; + } + /** + * 璁剧疆 棰勮鍦板潃 + * @param filePreViewUrl + */ + public void setFilePreViewUrl(String filePreViewUrl){ + this.filePreViewUrl = filePreViewUrl; + } /** * 鑾峰彇 鏍疯〃鍚嶇О * @return String @@ -340,6 +358,7 @@ public class PubdatumEntity extends PubdatumVo { sb.append(",sort:").append(getSort()); sb.append(",fileName:").append(getFileName()); sb.append(",fileUrl:").append(getFileUrl()); + sb.append(",filePreViewUrl:").append(getFilePreViewUrl()); sb.append(",sampleName:").append(getSampleName()); sb.append(",samplePath:").append(getSamplePath()); sb.append(",templateName:").append(getTemplateName()); @@ -371,6 +390,8 @@ public class PubdatumEntity extends PubdatumVo { this.fileUrl = null; + this.filePreViewUrl = null; + this.sampleName = null; this.samplePath = null; diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumQuery.java b/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumQuery.java index ec0f709015083a81f839cf3f81ed1f74e4285c4f..195e0dbe486d6b14496e6d70bf44593cea7f5fac 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumQuery.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumQuery.java @@ -6,7 +6,7 @@ import com.mortals.xhx.module.pubdatum.model.PubdatumEntity; * 浜嬮」鏉愭枡鍏叡搴撴煡璇㈠璞� * * @author zxfei - * @date 2022-12-02 + * @date 2023-01-06 */ public class PubdatumQuery extends PubdatumEntity { /** 寮€濮� 涓婚敭锛岃嚜澧為暱 */ @@ -87,6 +87,9 @@ public class PubdatumQuery extends PubdatumEntity { /** 濉崟鐨勯檮浠朵笅杞藉湴鍧€ */ private List<String> fileUrlList; + /** 棰勮鍦板潃 */ + private List<String> filePreViewUrlList; + /** 鏍疯〃鍚嶇О */ private List<String> sampleNameList; @@ -547,6 +550,21 @@ public class PubdatumQuery extends PubdatumEntity { public void setFileUrlList(List<String> fileUrlList){ this.fileUrlList = fileUrlList; } + /** + * 鑾峰彇 棰勮鍦板潃 + * @return filePreViewUrlList + */ + public List<String> getFilePreViewUrlList(){ + return this.filePreViewUrlList; + } + + /** + * 璁剧疆 棰勮鍦板潃 + * @param filePreViewUrlList + */ + public void setFilePreViewUrlList(List<String> filePreViewUrlList){ + this.filePreViewUrlList = filePreViewUrlList; + } /** * 鑾峰彇 鏍疯〃鍚嶇О * @return sampleNameList @@ -1105,6 +1123,25 @@ public class PubdatumQuery extends PubdatumEntity { } + /** + * 璁剧疆 棰勮鍦板潃 + * @param filePreViewUrl + */ + public PubdatumQuery filePreViewUrl(String filePreViewUrl){ + setFilePreViewUrl(filePreViewUrl); + return this; + } + + /** + * 璁剧疆 棰勮鍦板潃 + * @param filePreViewUrlList + */ + public PubdatumQuery filePreViewUrlList(List<String> filePreViewUrlList){ + this.filePreViewUrlList = filePreViewUrlList; + return this; + } + + /** * 璁剧疆 鏍疯〃鍚嶇О * @param sampleName diff --git a/fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml b/fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml index e6d19ed841f1898003aab6906c4d759c00fe9a1d..4249e9c59b91aee023dc732e4ea81dbd67ac0d8d 100644 --- a/fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml +++ b/fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml @@ -30,7 +30,6 @@ <result property="createTime" column="createTime" /> <result property="createUserId" column="createUserId" /> <result property="updateTime" column="updateTime" /> - </resultMap> diff --git a/fill-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml b/fill-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml index 18b2809c286650cc7b1e27c395e23e7c1e4b1fd4..134f3856de6354252bb2299636ef955ff5eb130e 100644 --- a/fill-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml +++ b/fill-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml @@ -27,9 +27,9 @@ <collection property="matterDatumList" column="id" ofType="MatterDatumEntity" javaType="ArrayList" select="getMatterDatumByMatterId"></collection> </resultMap> <resultMap type="MatterDatumEntity" id="MatterDatumEntity-Map"> - <result property="id" column="id" /> - <result property="matterId" column="matterId" /> + <id property="id" column="id" /> <result property="siteId" column="siteId" /> + <result property="matterId" column="matterId" /> <result property="deptId" column="deptId" /> <result property="deptCode" column="deptCode" /> <result property="deptName" column="deptName" /> @@ -39,9 +39,16 @@ <result property="isRecommend" column="isRecommend" /> <result property="total" column="total" /> <result property="sort" column="sort" /> + <result property="samplePrint" column="samplePrint" /> + <result property="fileName" column="fileName" /> + <result property="fileUrl" column="fileUrl" /> + <result property="filePreViewUrl" column="filePreViewUrl" /> <result property="sampleName" column="sampleName" /> <result property="samplePath" column="samplePath" /> + <result property="templateName" column="templateName" /> + <result property="templatePath" column="templatePath" /> <result property="preViewPath" column="preViewPath" /> + <result property="formContent" column="formContent" /> <result property="createTime" column="createTime" /> <result property="createUserId" column="createUserId" /> <result property="updateTime" column="updateTime" /> @@ -113,7 +120,7 @@ <!-- 瀛愯〃鎵€鏈夊垪 --> <sql id="_columns_sub"> <trim suffixOverrides="," suffix=""> - b.id,b.matterId,b.siteId,b.deptId,b.deptCode,b.deptName,b.materialName,b.materiaFullName,b.source,b.isRecommend,b.total,b.sort,b.sampleName,b.samplePath,b.preViewPath,b.createTime,b.createUserId,b.updateTime, + b.id,b.matterId,b.siteId,b.deptId,b.deptCode,b.deptName,b.materialName,b.materiaFullName,b.source,b.isRecommend,b.total,b.sort,b.samplePrint,b.fileName, b.fileUrl,b.filePreViewUrl,b.sampleName,b.samplePath,b.preViewPath,b.createTime,b.createUserId,b.updateTime, </trim> </sql> <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� --> diff --git a/fill-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.xml b/fill-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.xml index 18ddc55d7f2d8092b9029955317909acb00d642c..2447bf55ebd403fd1a9d08683efec39fdb0175f4 100644 --- a/fill-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.xml +++ b/fill-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.xml @@ -16,6 +16,7 @@ <result property="sort" column="sort" /> <result property="fileName" column="fileName" /> <result property="fileUrl" column="fileUrl" /> + <result property="filePreViewUrl" column="filePreViewUrl" /> <result property="sampleName" column="sampleName" /> <result property="samplePath" column="samplePath" /> <result property="templateName" column="templateName" /> @@ -65,6 +66,9 @@ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileUrl') or colPickMode == 1 and data.containsKey('fileUrl')))"> a.fileUrl, </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePreViewUrl') or colPickMode == 1 and data.containsKey('filePreViewUrl')))"> + a.filePreViewUrl, + </if> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))"> a.sampleName, </if> @@ -97,18 +101,18 @@ <!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� --> <insert id="insert" parameterType="PubdatumEntity" useGeneratedKeys="true" keyProperty="id"> insert into mortals_xhx_pubdatum - (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) + (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,fileName,fileUrl,filePreViewUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) VALUES - (#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{total},#{sort},#{fileName},#{fileUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime}) + (#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{total},#{sort},#{fileName},#{fileUrl},#{filePreViewUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime}) </insert> <!-- 鎵归噺鏂板 --> <insert id="insertBatch" parameterType="paramDto"> insert into mortals_xhx_pubdatum - (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) + (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,fileName,fileUrl,filePreViewUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) VALUES <foreach collection="data.dataList" item="item" index="index" separator="," > - (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.total},#{item.sort},#{item.fileName},#{item.fileUrl},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime}) + (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.total},#{item.sort},#{item.fileName},#{item.fileUrl},#{item.filePreViewUrl},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime}) </foreach> </insert> @@ -160,6 +164,9 @@ <if test="(colPickMode==0 and data.containsKey('fileUrl')) or (colPickMode==1 and !data.containsKey('fileUrl'))"> a.fileUrl=#{data.fileUrl}, </if> + <if test="(colPickMode==0 and data.containsKey('filePreViewUrl')) or (colPickMode==1 and !data.containsKey('filePreViewUrl'))"> + a.filePreViewUrl=#{data.filePreViewUrl}, + </if> <if test="(colPickMode==0 and data.containsKey('sampleName')) or (colPickMode==1 and !data.containsKey('sampleName'))"> a.sampleName=#{data.sampleName}, </if> @@ -292,6 +299,13 @@ </if> </foreach> </trim> + <trim prefix="filePreViewUrl=(case" suffix="ELSE filePreViewUrl end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('filePreViewUrl')) or (colPickMode==1 and !item.containsKey('filePreViewUrl'))"> + when a.id=#{item.id} then #{item.filePreViewUrl} + </if> + </foreach> + </trim> <trim prefix="sampleName=(case" suffix="ELSE sampleName end),"> <foreach collection="data.dataList" item="item" index="index" separator="" > <if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))"> @@ -672,6 +686,21 @@ </foreach> </if> + <if test="conditionParamRef.containsKey('filePreViewUrl')"> + <if test="conditionParamRef.filePreViewUrl != null and conditionParamRef.filePreViewUrl != ''"> + ${_conditionType_} a.filePreViewUrl like #{${_conditionParam_}.filePreViewUrl} + </if> + <if test="conditionParamRef.filePreViewUrl == null"> + ${_conditionType_} a.filePreViewUrl is null + </if> + </if> + <if test="conditionParamRef.containsKey('filePreViewUrlList')"> + ${_conditionType_} a.filePreViewUrl in + <foreach collection="conditionParamRef.filePreViewUrlList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('sampleName')"> <if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''"> ${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName} @@ -880,6 +909,11 @@ <if test='orderCol.fileUrl != null and "DESC".equalsIgnoreCase(orderCol.fileUrl)'>DESC</if> , </if> + <if test="orderCol.containsKey('filePreViewUrl')"> + a.filePreViewUrl + <if test='orderCol.filePreViewUrl != null and "DESC".equalsIgnoreCase(orderCol.filePreViewUrl)'>DESC</if> + , + </if> <if test="orderCol.containsKey('sampleName')"> a.sampleName <if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if>