花名册-附件

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterFiles.java

@@ -32,5 +32,10 @@ public class RosterFiles extends BaseEntity {
      */
     private String url;
 
+    /**
+     * 文件名称
+     */
+    private String name;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterBaseMapper.xml

@@ -199,7 +199,8 @@
     rf.remarks,
     rf.del_flag,
     rf.base_id,
-    rf.url
+    rf.url,
+    rf.name
   </sql>
   <sql id="Work_Column_List">
     rw.id,
@@ -253,13 +254,29 @@
     from roster_certificate rce
     where rce.del_flag = '0' and rce.base_id = #{id}
   </select>
-  <select id="getFilesList" resultType="com.jeeplus.test.roster.service.dto.RosterFilesDTO">
+  <select id="getFilesList" resultMap="FilesMap">
     select
-    <include refid="Files_Column_List"></include>
+    <include refid="Files_Column_List"></include>,
+    su.name su_name
     from roster_files rf
+    left join sys_user su on rf.create_by = su.id and su.del_flag = '0'
     where rf.del_flag = '0' and rf.base_id = #{id}
   </select>
 
+  <resultMap id="FilesMap" type="com.jeeplus.test.roster.service.dto.RosterFilesDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="url" jdbcType="VARCHAR" property="url" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="su_name" jdbcType="VARCHAR" property="createBy.name" />
+  </resultMap>
+
   <select id="findList" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"></include>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterFilesMapper.xml

@@ -11,6 +11,7 @@
     <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
     <result column="base_id" jdbcType="VARCHAR" property="baseId" />
     <result column="url" jdbcType="VARCHAR" property="url" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
   </resultMap>
   <sql id="Base_Column_List">
     rf.id,
@@ -21,6 +22,7 @@
     rf.remarks,
     rf.del_flag,
     rf.base_id,
-    rf.url
+    rf.url,
+    rf.name
   </sql>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/RosterBaseService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.utils.BeanUtils;
 import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.rank.service.dto.RankSystemTableDTO;
@@ -228,6 +229,9 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
                     if(ObjectUtil.isNotEmpty(item)&& BeanUtils.objectCheckIsNull(item)){
                         RosterFiles rosterFiles = RosterFilesWrapper.INSTANCE.toEntity(item);
                         rosterFiles.setBaseId(rosterBase.getId());
+                        if(StringUtils.isNotBlank(item.getCreateBy().getId())){
+                            rosterFiles.setCreateBy(item.getCreateBy().getId());
+                        }
                         rosterFilesService.saveOrUpdate(rosterFiles);
                     }
                 });

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterFilesDTO.java

@@ -31,5 +31,10 @@ public class RosterFilesDTO extends BaseDTO {
      */
     private String url;
 
+    /**
+     * 文件名称
+     */
+    private String name;
+
     private static final long serialVersionUID = 1L;
 }