1.26修改上传附件

qianhe-gzpt/src/main/java/com/qianhe/domain/WorkAccessory.java

@@ -41,8 +41,11 @@ public class WorkAccessory extends BaseEntity
     @Excel(name = "附件路径")
     @Excel(name = "附件路径")
     private String accessoryUrl;
     private String accessoryUrl;
 
 
+    /** 附件名称(无时间戳) */
+    @Excel(name = "附件名称（无时间戳）")
+    private String fileName;
+
     /** 附件名称 */
     /** 附件名称 */
-    @Excel(name = "附件名称")
     private String accessoryName;
     private String accessoryName;
 
 
     /** 创建者 */
     /** 创建者 */

qianhe-gzpt/src/main/resources/mapper/WorkAccessoryMapper.xml

@@ -10,6 +10,7 @@
         <result property="moduleName"    column="module_name"    />
         <result property="moduleName"    column="module_name"    />
         <result property="accessoryType"    column="accessory_type"    />
         <result property="accessoryType"    column="accessory_type"    />
         <result property="accessoryUrl"    column="accessory_url"    />
         <result property="accessoryUrl"    column="accessory_url"    />
+        <result property="fileName"    column="file_name"    />
         <result property="accessoryName"    column="accessory_name"    />
         <result property="accessoryName"    column="accessory_name"    />
         <result property="createBy"    column="create_by"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="createTime"    column="create_time"    />
@@ -19,7 +20,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="selectWorkAccessoryVo">
     <sql id="selectWorkAccessoryVo">
-        select id, business_id, module_name, accessory_type, accessory_url, accessory_name, create_by, create_time, update_by, update_time, del_flag from work_accessory
+        select id, business_id, module_name, accessory_type, accessory_url, file_name, accessory_name, create_by, create_time, update_by, update_time, del_flag from work_accessory
     </sql>
     </sql>
 
 
     <select id="selectWorkAccessoryList" parameterType="WorkAccessory" resultMap="WorkAccessoryResult">
     <select id="selectWorkAccessoryList" parameterType="WorkAccessory" resultMap="WorkAccessoryResult">
@@ -30,6 +31,7 @@
             <if test="moduleName != null  and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
             <if test="moduleName != null  and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
             <if test="accessoryType != null  and accessoryType != ''"> and accessory_type = #{accessoryType}</if>
             <if test="accessoryType != null  and accessoryType != ''"> and accessory_type = #{accessoryType}</if>
             <if test="accessoryUrl != null  and accessoryUrl != ''"> and accessory_url = #{accessoryUrl}</if>
             <if test="accessoryUrl != null  and accessoryUrl != ''"> and accessory_url = #{accessoryUrl}</if>
+            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="accessoryName != null  and accessoryName != ''"> and accessory_name like concat('%', #{accessoryName}, '%')</if>
             <if test="accessoryName != null  and accessoryName != ''"> and accessory_name like concat('%', #{accessoryName}, '%')</if>
         </where>
         </where>
         order by create_time DESC
         order by create_time DESC
@@ -47,6 +49,7 @@
             <if test="moduleName != null and moduleName != ''">module_name,</if>
             <if test="moduleName != null and moduleName != ''">module_name,</if>
             <if test="accessoryType != null and accessoryType != ''">accessory_type,</if>
             <if test="accessoryType != null and accessoryType != ''">accessory_type,</if>
             <if test="accessoryUrl != null and accessoryUrl != ''">accessory_url,</if>
             <if test="accessoryUrl != null and accessoryUrl != ''">accessory_url,</if>
+            <if test="fileName != null and fileName != ''">file_name,</if>
             <if test="accessoryName != null and accessoryName != ''">accessory_name,</if>
             <if test="accessoryName != null and accessoryName != ''">accessory_name,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createTime != null">create_time,</if>
@@ -59,6 +62,7 @@
             <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
             <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
             <if test="accessoryType != null and accessoryType != ''">#{accessoryType},</if>
             <if test="accessoryType != null and accessoryType != ''">#{accessoryType},</if>
             <if test="accessoryUrl != null and accessoryUrl != ''">#{accessoryUrl},</if>
             <if test="accessoryUrl != null and accessoryUrl != ''">#{accessoryUrl},</if>
+            <if test="fileName != null and fileName != ''">#{fileName},</if>
             <if test="accessoryName != null and accessoryName != ''">#{accessoryName},</if>
             <if test="accessoryName != null and accessoryName != ''">#{accessoryName},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -75,6 +79,7 @@
             <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
             <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
             <if test="accessoryType != null and accessoryType != ''">accessory_type = #{accessoryType},</if>
             <if test="accessoryType != null and accessoryType != ''">accessory_type = #{accessoryType},</if>
             <if test="accessoryUrl != null and accessoryUrl != ''">accessory_url = #{accessoryUrl},</if>
             <if test="accessoryUrl != null and accessoryUrl != ''">accessory_url = #{accessoryUrl},</if>
+            <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
             <if test="accessoryName != null and accessoryName != ''">accessory_name = #{accessoryName},</if>
             <if test="accessoryName != null and accessoryName != ''">accessory_name = #{accessoryName},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

qianhe-gzpt/src/main/resources/mapper/WorkXmMapper.xml

@@ -140,7 +140,7 @@
     </update>
     </update>
 
 
     <select id="selectFile" resultType="com.qianhe.domain.WorkAccessory">
     <select id="selectFile" resultType="com.qianhe.domain.WorkAccessory">
-        select id, business_id, module_name, accessory_type, accessory_url, accessory_name, create_by, create_time, update_by, update_time, del_flag
+        select id, business_id, module_name, accessory_type, accessory_url, file_name, accessory_name, create_by, create_time, update_by, update_time, del_flag
         from work_accessory where del_flag = '0' and business_id = #{businessId} and module_name = #{moduleName}
         from work_accessory where del_flag = '0' and business_id = #{businessId} and module_name = #{moduleName}
     </select>
     </select>
 </mapper>
 </mapper>

qianhe-gzpt/src/main/resources/mapper/WorkXmcbMapper.xml

@@ -140,9 +140,9 @@
     </select>
     </select>
 
 
     <insert id="insertFile" parameterType="com.qianhe.domain.WorkAccessory">
     <insert id="insertFile" parameterType="com.qianhe.domain.WorkAccessory">
-        insert into work_accessory(id, business_id, module_name, accessory_url, accessory_name, create_by, create_time) values
+        insert into work_accessory(id, business_id, module_name, accessory_url, file_name, accessory_name, create_by, create_time) values
         <foreach item="item" index="index" collection="list" separator=",">
         <foreach item="item" index="index" collection="list" separator=",">
-            (0,#{item.businessId}, #{item.moduleName}, #{item.accessoryUrl}, #{item.accessoryName}, #{item.createBy}, #{item.createTime})
+            (0,#{item.businessId}, #{item.moduleName}, #{item.accessoryUrl}, #{item.fileName}, #{item.accessoryName}, #{item.createBy}, #{item.createTime})
         </foreach>
         </foreach>
     </insert>
     </insert>