Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java

@@ -45,13 +45,22 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
      * @param param
      * @return
      */
-    @Select("<script>select * from b_chapter  " +
-            "where del_flag = 0 and flag = 1 and pid = -1 " +
-            "   and lesson_id = #{lessonId} " +
-
-            "and corp_id = #{corpId} " +
-
-            "order by sort asc</script>")
+    @Select("<script>SELECT\n" +
+            "\tbc.*,\n" +
+            "\tbf.file_size AS fileSize \n" +
+            "FROM\n" +
+            "\tb_chapter bc\n" +
+            "\tLEFT JOIN b_file bf ON bf.chapter_id = bc.business_id \n" +
+            "WHERE\n" +
+            "\tbc.del_flag = 0 \n" +
+            "\tAND bc.flag = 1 \n" +
+            "\tAND bc.pid = - 1 \n" +
+            "\tAND bc.lesson_id = #{lessonId}\n" +
+            "\t\n" +
+            "\tAND bc.corp_id = #{corpId}\n" +
+            "\t\n" +
+            "ORDER BY\n" +
+            "\tsort ASC</script>")
     @ResultMap(value = "SupperChildListResultMap")
     List<QueryChapterListResDTO> queryBChapters(Map<String, Object> param);
 

src/main/java/org/rcisoft/business/bchapter/dto/QueryChapterListResDTO.java

@@ -40,6 +40,9 @@ public class QueryChapterListResDTO {
     @ApiModelProperty(value = "视频地址")
     private String videoUrl;
 
+    @ApiModelProperty(value = "文件大小")
+    private String fileSize;
+
     @ApiModelProperty(value = "文件地址")
     private String fileUrl;
 

src/main/java/org/rcisoft/business/breleasevalue/controller/BReleaseValueController.java

@@ -110,4 +110,13 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
                 gridModel);
     }
 
+    @ApiOperation(value="1507 查询用户发布课程、培训积分", notes="查询用户发布课程、培训积分" )
+    @GetMapping(value = "/queryPersonReleaseValue")
+    public Result queryPersonReleaseValue(CurUser curUser) {
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                bReleaseValueServiceImpl.queryPersonReleaseValue(curUser));
+    }
+
 }

src/main/java/org/rcisoft/business/breleasevalue/service/BReleaseValueService.java

@@ -9,6 +9,7 @@ import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by  on 2019-11-13 13:28:38.
@@ -62,4 +63,6 @@ public interface BReleaseValueService {
      * @return
      */
     List<UserValueDto> queryUserValueByPagination(PageUtil pageUtil, UserValueResDto dto);
+
+    Map<String,Object> queryPersonReleaseValue(CurUser curUser);
 }

src/main/java/org/rcisoft/business/breleasevalue/service/impl/BReleaseValueServiceImpl.java

 package org.rcisoft.business.breleasevalue.service.impl;
 
+import org.apache.commons.collections.map.HashedMap;
 import org.rcisoft.business.breleasevalue.dto.*;
 import org.rcisoft.business.breleasevalue.entity.BReleaseValueSon;
 import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
@@ -204,6 +205,19 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
         return users;
     }
 
+    @Override
+    public Map<String,Object> queryPersonReleaseValue(CurUser curUser) {
+        List<BReleaseValue> list = bReleaseValueRepository.selectReleaseValueByPersonId(curUser);
+        Map<String,Object> map = new HashedMap();
+        if(list.size() < 1){
+            return  map;
+        }
+        map.put("trainValue",list.get(0).getTrainValue());
+        map.put("lessonValue",list.get(0).getLessonValue());
+        map.put("userId",curUser.getUserId());
+        return map;
+    }
+
     /**
      * 去掉子表中已有用户信息，插入新的数据
      * @param userIds