员工信息-文件

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.xml

@@ -47,7 +47,8 @@
            ry.zgzctqsj,
            ry.rotaterotate_type rotaterotateType,
            ry.head,
-           ry.avatorurl avatorUrl
+           ry.avatorurl avatorUrl,
+           ry.ryfj
         from
             base:d_ryxxsjy ry
         left join base:d_ryzwlxb zwlx on zwlx.rysfzh = ry.sfzh and zwlx.qymc = ry.qymc

src/main/java/com/chinaitop/depot/basic/model/DRyxxsjyVO.java

@@ -342,4 +342,9 @@ public class DRyxxsjyVO {
 	private String fileUrl;
 	@ApiModelProperty(value = "文件名称")
 	private String fileName;
+
+	@ApiModelProperty(value = "文件url")
+	private String ryfjFileUrl;
+	@ApiModelProperty(value = "文件名称")
+	private String ryfjFileName;
 }

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.StringJoiner;
 
 /**
  * @author qingsong.han
@@ -112,7 +113,22 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
                 }
             });
         }
-        // 其它附件-暂无
+        // 其它附件
+        String ryfjStrS = dRyxxsjyVO.getRyfj();
+        if (StringUtils.hasText(ryfjStrS)) {
+            String[] ryfjs = ryfjStrS.split(",");
+            StringJoiner link = new StringJoiner(",");
+            StringJoiner name = new StringJoiner(",");
+            for (String ryfj : ryfjs) {
+                FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getRyfj());
+                if (!ObjectUtils.isEmpty(data)) {
+                    link.add(data.getLink());
+                    name.add(data.getName());
+                }
+            }
+            dRyxxsjyVO.setRyfjFileUrl(link.toString());
+            dRyxxsjyVO.setRyfjFileName(name.toString());
+        }
         // 职务类型变更记录
         List<ZwlxbgjlVO> zwlxbgjlVOList = dRyxxsjyMapper.getZwlxbgjlListById(dRyxxsjyVO.getSfzh());
         if (!CollectionUtils.isEmpty(zwlxbgjlVOList)) {
@@ -120,4 +136,5 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
         }
         return dRyxxsjyVO;
     }
+
 }