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

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -702,4 +702,16 @@ public class BLessonController extends PaginationController<BLesson> {
                 gridModel);
     }
 
+    @ApiOperation(value = "641 用户管理 - 考试情况 ", notes = "用户管理 - 考试情况 ")
+    @GetMapping(value = "/userManageExamByPagination")
+    public Result userManageExamByPagination(CurUser curUser, @Valid UserLessonDTO userLessonDTO, BindingResult bindingResult) {
+        //原型不完整---查询条件不明确
+        bLessonService.userManageExamByPagination(getPaginationUtility(), userLessonDTO);
+        GridModel gridModel = getGridModelResponse();
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                gridModel);
+    }
+
 }

src/main/java/org/rcisoft/business/blesson/dao/BLessonPersonRepository.java

@@ -408,4 +408,8 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
     List<StudentTrackingRspDTO> userManageLesson(@Param("param") UserLessonDTO userLessonDTO, @Param("trainTypeSelStr")String trainTypeSelStr);
 
 
+    @Select("")
+    List<StudentTrackingRspDTO> userManageExam();
+    
+
 }

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -299,4 +299,6 @@ public interface BLessonService{
      */
     List<StudentTrackingRspDTO>  userManageLessonByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO);
 
+    List<StudentTrackingRspDTO>  userManageExamByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO);
+
 }

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -1301,6 +1301,11 @@ public class BLessonServiceImpl implements BLessonService {
         return bLessonPersonRepository.userManageLesson(userLessonDTO,trainTypeSelStr);
     }
 
+    @Override
+    public List<StudentTrackingRspDTO> userManageExamByPagination(PageUtil pageUtil, UserLessonDTO userLessonDTO) {
+        return bLessonPersonRepository.userManageExam();
+    }
+
     //遍历标签放入List中
     List<BLessonLabel> addLabel(BLesson model) {
         //标签集合

src/main/java/org/rcisoft/business/bpersonvalue/controller/BPersonValueController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.map.HashedMap;
 import org.bouncycastle.asn1.x509.sigi.PersonalData;
 import org.rcisoft.business.bbanner.entity.BBanner;
+import org.rcisoft.business.bpersonvalue.dto.PersonValueClientDto;
 import org.rcisoft.business.bpersonvalue.dto.PersonValueDto;
 import org.rcisoft.common.controller.PaginationController;
 import org.rcisoft.common.model.GridModel;
@@ -46,9 +47,8 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
 
     @ApiOperation(value = "1601 明细", notes = " type类型（0：获取积分 +，1：消耗积分 -）", response = BPersonValue.class)
     @GetMapping(value = "/queryByPagination")
-    @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
-    public Result queryByPagination(CurUser curUser,String businessId) {
-        bPersonValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId(),businessId);
+    public Result queryByPagination(CurUser curUser,@Valid PersonValueClientDto dto ,BindingResult bindingResult) {
+        bPersonValueServiceImpl.queryByPagination(getPaginationUtility(),curUser,dto);
         GridModel gridModel = getGridModelResponse();
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -68,9 +68,8 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
 
     @ApiOperation(value = "1603 用户明细带总积分", notes = " 用户明细带总积分", response = BPersonValue.class)
     @GetMapping(value = "/queryPersonValueByPagination")
-    @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
-    public Result queryPersonValueByPagination(CurUser curUser) {
-        bPersonValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId(),curUser.getUserId());
+    public Result queryPersonValueByPagination(CurUser curUser, @Valid PersonValueClientDto dto ,BindingResult bindingResult) {
+        bPersonValueServiceImpl.queryByPagination(getPaginationUtility(),curUser, dto);
         GridModel gridModel = getGridModelResponse();
         Map<String,Object> map = new HashedMap();
         map.put("details",gridModel);

src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java

 package org.rcisoft.business.bpersonvalue.dao;
 
 import org.apache.ibatis.annotations.*;
+import org.rcisoft.business.bpersonvalue.dto.PersonValueClientDto;
 import org.rcisoft.business.bpersonvalue.dto.PersonValueDto;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.business.bpersonvalue.entity.BPersonValue;
@@ -19,9 +20,23 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
      * 分页查询 bPersonValue
      *
     */
-    @Select("select * from b_person_value where del_flag != 1 and flag = 1 and person_id = #{id} ORDER BY create_date desc")
+    @Select("<script>" +
+            "select * from b_person_value where del_flag != 1 and flag = 1 " +
+            "and person_id = #{businessId} " +
+            "<if test=\"startTime !=null and startTime != '' \"> and create_date &lt;= #{startTime} </if> "+
+            "<if test=\"endTime !=null and endTime != '' \"> and create_date &gt;= #{endTime} </if> "+
+            "<if test=\"event !=null and event != '' \"> and event like concat('%',#{event},'%') </if> "+
+//            "<if test=\"type !=null and type != '' \"> and event like concat('%',#{event},'%') </if> "+
+
+            " ORDER BY person_id " +
+            "<if test=\" valueSort !=null and valueSort != '' and valueSort == '0'.toString() \">  ,type asc,value desc </if> "+
+            "<if test=\" valueSort !=null and valueSort != '' and valueSort == '1'.toString() \">  ,type desc,value asc </if> "+
+            "<if test=\" dateSort !=null and dateSort != '' and dateSort == '0'.toString() \">  ,create_date asc</if> "+
+            "<if test=\" dateSort !=null and dateSort != '' and dateSort == '1'.toString() \">  ,create_date desc</if> "+
+            "</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BPersonValue> queryBPersonValues(@Param("id") String id);
+    List<BPersonValue> queryBPersonValues(PersonValueClientDto dto);
+
 
     @Select("select `value` from s_user where business_id = #{businessId} and del_flag != 1 and flag =1 and corp_id = #{corpId}")
     String getUserValue(@Param("corpId") String corpId, @Param("businessId") String businessId);

src/main/java/org/rcisoft/business/bpersonvalue/dto/PersonValueClientDto.java

+package org.rcisoft.business.bpersonvalue.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PersonValueClientDto {
+
+    @ApiModelProperty(value = "用户Id")
+    public String businessId;
+
+    @ApiModelProperty(value = "起始时间")
+    public String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    public String endTime;
+
+    @ApiModelProperty(value = "事件")
+    public String event;
+
+    @ApiModelProperty(value = "类型")
+    public String type;
+
+    @ApiModelProperty(value = "时间排序 0正序 1倒序")
+    public String dateSort;
+
+    @ApiModelProperty(value = "积分排序 0正序 1倒序")
+    public String valueSort;
+
+
+
+}

src/main/java/org/rcisoft/business/bpersonvalue/service/BPersonValueService.java

 package org.rcisoft.business.bpersonvalue.service;
 
+import org.rcisoft.business.bpersonvalue.dto.PersonValueClientDto;
 import org.rcisoft.business.bpersonvalue.dto.PersonValueDto;
 import org.rcisoft.business.bpersonvalue.entity.BPersonValue;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
 
@@ -12,7 +14,7 @@ import java.util.List;
  */
 public interface BPersonValueService {
 
-    List<BPersonValue> queryByPagination(PageUtil pageUtil,String corpId,String businessId);
+    List<BPersonValue> queryByPagination(PageUtil pageUtil, CurUser curUser, PersonValueClientDto dto);
 
     String getUserValue(String corpId,String businessId);
 

src/main/java/org/rcisoft/business/bpersonvalue/service/impl/BPersonValueServiceImpl.java

 package org.rcisoft.business.bpersonvalue.service.impl;
 
+import org.rcisoft.business.bpersonvalue.dto.PersonValueClientDto;
 import org.rcisoft.business.bpersonvalue.dto.PersonValueDto;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.ResultServiceEnums;
@@ -11,6 +12,7 @@ import org.rcisoft.business.bpersonvalue.entity.BPersonValue;
 import org.rcisoft.business.bpersonvalue.service.BPersonValueService;
 
 
+import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,8 +37,11 @@ public class BPersonValueServiceImpl implements BPersonValueService {
 
 
     @Override
-    public List<BPersonValue> queryByPagination(PageUtil pageUtil, String corpId, String businessId) {
-        return bPersonValueRepository.queryBPersonValues(businessId);
+    public List<BPersonValue> queryByPagination(PageUtil pageUtil, CurUser curUser,PersonValueClientDto dto) {
+        if(dto.getBusinessId() == null){
+            dto.setBusinessId(curUser.getUserId());
+        }
+        return bPersonValueRepository.queryBPersonValues(dto);
     }
 
     @Override

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

@@ -100,7 +100,7 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
                 businessId);
     }
 
-    @ApiOperation(value="1504 分页查询 用户积分设置页面", notes="分页查询 用户积分设置页面")
+    @ApiOperation(value="1506 分页查询 用户积分统计页面", notes="分页查询 用户积分设置页面")
     @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "模糊查询关键字", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "dept", value = "部门id", required = true, dataType = "varchar")})
     @GetMapping(value = "/queryUserValue")

src/main/java/org/rcisoft/business/breleasevalue/dto/BReleaseValueDto.java

@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 public class BReleaseValueDto {
 
-    @ApiModelProperty(value = "标题")
+    @ApiModelProperty(value = "分组名")
     private String title;
 
     @ApiModelProperty(value = "主键id")

src/main/java/org/rcisoft/business/breleasevalue/dto/UserValueResDto.java

+package org.rcisoft.business.breleasevalue.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserValueResDto {
+
+    @ApiModelProperty(value = "用户名")
+    public String name;
+
+    @ApiModelProperty(value = "部门id")
+    public String dept;
+
+    @ApiModelProperty(value = "当前积分起始")
+    public String nowValueStart;
+
+    @ApiModelProperty(value = "当前积分截至")
+    public String nowValueEnd;
+
+    @ApiModelProperty(value = "获取积分起始")
+    public String gainValueStart;
+
+    @ApiModelProperty(value = "获取积分截至")
+    public String gainValueEnd;
+
+}