1.给组织加入英文名、徽章、宣传图等信息

2.修复笔记没显示视频所在时间bug

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseNotesMapper.xml

@@ -36,6 +36,7 @@
             IFNULL(ci.COURSE_NAME,'') AS courseName,
             IFNULL(cn.USER_ID,'') AS userId,
             IFNULL(CAST(cn.NOTE_CONTENT AS VARCHAR),'') AS noteContent,
+            IFNULL(cn.RECORD_TIME,'') AS recordTime,
             IFNULL(cr.MAIN_ID ,'') AS hourId,
             IFNULL(cc.NAME,'') AS hourIdName
         FROM COURSE_NOTES cn
@@ -61,6 +62,7 @@
             IFNULL(ci.COURSE_NAME,'') AS courseName,
             IFNULL(cn.USER_ID,'') AS userId,
             IFNULL(CAST(cn.NOTE_CONTENT AS VARCHAR),'') AS noteContent,
+            IFNULL(cn.RECORD_TIME,'') AS recordTime,
             IFNULL(cr.MAIN_ID ,'') AS hourId,
             IFNULL(cc.NAME,'') AS hourIdName
         FROM COURSE_NOTES cn

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java

@@ -77,4 +77,27 @@ public class SysOrg extends CommonEntity {
     @ApiModelProperty(value = "是否是资源库特殊账号，0否1是")
     @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private String isResourceaccount;
+
+
+    /** 英文名称 */
+    @ApiModelProperty(value = "英文名称", position = 7)
+    private String englishName;
+
+    /** 徽章附件id */
+    @ApiModelProperty(value = "徽章附件id", position = 7)
+    private String badge;
+
+    /** 徽章路径 */
+    @ApiModelProperty(value = "徽章路径", position = 7)
+    @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
+    private String badgePath;
+
+    /** 宣传图 */
+    @ApiModelProperty(value = "宣传图", position = 7)
+    private String propagandizePic;
+
+    /** 宣传图路径 */
+    @ApiModelProperty(value = "宣传图路径", position = 7)
+    @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
+    private String propagandizePicPath;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/mapper/SysOrgMapper.java

@@ -42,4 +42,16 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
      */
     @InterceptorIgnore(tenantLine = "true")
     void deleteIgnoreInterceptor(@Param("ew") LambdaQueryWrapper<SysOrg> lambdaQueryWrapper);
+
+    /**
+     * 获取组织其他信息
+     * （用于补全信息）
+     * */
+    Map<String,Object> getOtherInfo(Map param);
+
+    /**
+     * 获取人员其他信息-列表
+     * （用于补全信息）
+     * */
+    List<Map<String,Object>> getOtherInfoList(Map param);
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/mapper/mapping/SysOrgMapper.xml

@@ -20,4 +20,40 @@
             AND t1.CATEGORY =#{category}
         </if>
     </select>
+
+    <select id="getOtherInfo" resultType="java.util.Map">
+        SELECT
+            IFNULL(so.ENGLISH_NAME,'') AS englishName,
+            IFNULL(so.BADGE,'') AS badge,
+            IFNULL(CAST(df.DOWNLOAD_PATH AS VARCHAR),'') AS badgePath,
+            IFNULL(so.PROPAGANDIZE_PIC,'')  AS propagandizePic,
+            IFNULL(CAST(df2.DOWNLOAD_PATH AS VARCHAR),'') AS propagandizePicPath
+        FROM SYS_ORG so
+        LEFT JOIN DEV_FILE df ON so.BADGE =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE df2 ON so.PROPAGANDIZE_PIC =df2.ID AND df2.DELETE_FLAG ='NOT_DELETE'
+        WHERE 1=1
+        <if test="id !=null and id != ''">
+            AND so.ID =#{id}
+        </if>
+    </select>
+
+    <select id="getOtherInfoList" resultType="java.util.Map">
+        SELECT
+            IFNULL(so.ENGLISH_NAME,'') AS englishName,
+            IFNULL(so.BADGE,'') AS badge,
+            IFNULL(CAST(df.DOWNLOAD_PATH AS VARCHAR),'') AS badgePath,
+            IFNULL(so.PROPAGANDIZE_PIC,'')  AS propagandizePic,
+            IFNULL(CAST(df2.DOWNLOAD_PATH AS VARCHAR),'') AS propagandizePicPath
+        FROM SYS_ORG so
+        LEFT JOIN DEV_FILE df ON so.BADGE =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN DEV_FILE df2 ON so.PROPAGANDIZE_PIC =df2.ID AND df2.DELETE_FLAG ='NOT_DELETE'
+        WHERE 1=1
+        <if test="idList !=null and idList.size()>0">
+            so t1.ID in
+            <foreach collection=" idList" close=")" index="index" item="item" open="(" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgAddParam.java

@@ -56,4 +56,17 @@ public class SysOrgAddParam {
     /** 扩展JSON */
     @ApiModelProperty(value = "扩展JSON", position = 6)
     private String extJson;
+
+
+    /** 英文名称 */
+    @ApiModelProperty(value = "英文名称", position = 7)
+    private String englishName;
+
+    /** 徽章附件id */
+    @ApiModelProperty(value = "徽章附件id", position = 7)
+    private String badge;
+
+    /** 宣传图 */
+    @ApiModelProperty(value = "宣传图", position = 7)
+    private String propagandizePic;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgEditParam.java

@@ -61,4 +61,16 @@ public class SysOrgEditParam {
     /** 扩展JSON */
     @ApiModelProperty(value = "扩展JSON", position = 7)
     private String extJson;
+
+    /** 英文名称 */
+    @ApiModelProperty(value = "英文名称", position = 7)
+    private String englishName;
+
+    /** 徽章附件id */
+    @ApiModelProperty(value = "徽章附件id", position = 7)
+    private String badge;
+
+    /** 宣传图 */
+    @ApiModelProperty(value = "宣传图", position = 7)
+    private String propagandizePic;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -48,10 +48,7 @@ import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 import vip.xiaonuo.sys.modular.user.service.SysUserService;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -199,7 +196,19 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public SysOrg detail(SysOrgIdParam sysOrgIdParam) {
-        return this.queryEntity(sysOrgIdParam.getId());
+        SysOrg sysOrg=this.queryEntity(sysOrgIdParam.getId());
+        Map<String,Object> param=new HashMap<>();
+        param.put("id",sysOrg.getId());
+        Map<String,Object> otherInfo=sysOrgMapper.getOtherInfo(param);
+        if(ObjectUtil.isNotEmpty(otherInfo))
+        {
+            if(ObjectUtil.isNotEmpty(otherInfo.get("englishName")))sysOrg.setEnglishName(String.valueOf(otherInfo.get("englishName")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("badge")))sysOrg.setBadge(String.valueOf(otherInfo.get("badge")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("badgePath")))sysOrg.setBadgePath(String.valueOf(otherInfo.get("badgePath")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("propagandizePic")))sysOrg.setPropagandizePic(String.valueOf(otherInfo.get("propagandizePic")));
+            if(ObjectUtil.isNotEmpty(otherInfo.get("propagandizePicPath")))sysOrg.setPropagandizePicPath(String.valueOf(otherInfo.get("propagandizePicPath")));
+        }
+        return sysOrg;
     }
 
     @Override