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

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

@@ -9,8 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
 import org.rcisoft.business.bbanner.entity.BBanner;
-import org.rcisoft.business.breleasevalue.dto.BReleaseValueDto;
-import org.rcisoft.business.breleasevalue.dto.LessonValueSettingQueryDto;
+import org.rcisoft.business.breleasevalue.dto.*;
 import org.rcisoft.common.controller.PaginationController;
 import org.rcisoft.common.model.GridModel;
 import org.rcisoft.sys.user.bean.CurUser;
@@ -44,10 +43,10 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
     @Autowired
     private BReleaseValueService bReleaseValueServiceImpl;
 
-    @ApiOperation(value = "1501 分页查询", notes = "根据条件分页查询", response = BBanner.class)
+    @ApiOperation(value = "1501 分页查询积分管理", notes = "根据条件分页查询", response = BReleaseValue.class)
     @GetMapping(value = "/queryByPagination")
-    public Result queryByPagination(CurUser curUser) {
-        bReleaseValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId());
+    public Result queryByPagination(CurUser curUser,@Valid ReleaseValueResDto dto ,BindingResult br) {
+        bReleaseValueServiceImpl.queryByPagination(getPaginationUtility(), dto);
         GridModel gridModel = getGridModelResponse();
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -55,7 +54,7 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
                 gridModel);
     }
 
-    @ApiOperation(value="1502 添加、编辑", notes="添加编辑接口(businessId为空是添加)")
+    @ApiOperation(value="1502 添加、编辑积分管理", notes="添加编辑接口(businessId为空是添加)")
     @PostMapping(value = "/add")
     public Result add(CurUser curUser, @Valid BReleaseValueDto bReleaseValueDto, BindingResult bindingResult) {
         PersistModel data = bReleaseValueServiceImpl.save(bReleaseValueDto);
@@ -65,7 +64,7 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
                 bReleaseValueDto);
     }
 
-    @ApiOperation(value="1503 删除", notes="删除")
+    @ApiOperation(value="1503 删除积分管理", notes="删除")
     @ApiImplicitParam(name = "businessId", value = "主键id", required = true, dataType = "varchar")
     @PostMapping(value = "/delete")
     public Result delete(CurUser curUser, String businessId ) {
@@ -76,7 +75,7 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
                 businessId);
     }
 
-    @ApiOperation(value="1504 分页查询课程、培训积分设置页面", notes="分页查询课程、培训积分设置页面")
+    @ApiOperation(value="1504 分页查询课程、培训积分设置页面", notes="分页查询课程、培训积分设置页面",response = LessonValueDto.class)
     @GetMapping(value = "/queryLessonValue")
     public Result queryLessonValue(CurUser curUser, @Valid LessonValueSettingQueryDto dto ,BindingResult bindingResult) {
         bReleaseValueServiceImpl.queryLessonValueByPagination(getPaginationUtility(),curUser,dto);
@@ -100,12 +99,10 @@ public class BReleaseValueController extends PaginationController<BReleaseValue>
                 businessId);
     }
 
-    @ApiOperation(value="1506 分页查询 用户积分统计页面", notes="分页查询 用户积分设置页面")
-    @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "模糊查询关键字", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "dept", value = "部门id", required = true, dataType = "varchar")})
+    @ApiOperation(value="1506 分页查询 用户积分统计页面", notes="分页查询 用户积分设置页面" ,response = UserValueDto.class)
     @GetMapping(value = "/queryUserValue")
-    public Result queryUserValue(CurUser curUser, String name,String dept) {
-        bReleaseValueServiceImpl.queryUserValueByPagination(getPaginationUtility(),name,curUser.getCorpId(),dept);
+    public Result queryUserValue(CurUser curUser, UserValueResDto dto) {
+        bReleaseValueServiceImpl.queryUserValueByPagination(getPaginationUtility(),dto);
         GridModel gridModel = getGridModelResponse();
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java

 package org.rcisoft.business.breleasevalue.dao;
 
 import org.apache.ibatis.annotations.*;
-import org.rcisoft.business.breleasevalue.dto.LessonValueDto;
-import org.rcisoft.business.breleasevalue.dto.LessonValueSettingQueryDto;
-import org.rcisoft.business.breleasevalue.dto.UserValueDto;
+import org.rcisoft.business.breleasevalue.dto.*;
 import org.rcisoft.business.breleasevalue.entity.BReleaseValueSon;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.business.breleasevalue.entity.BReleaseValue;
@@ -23,9 +21,26 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
     * 分页查询 bReleaseValue
     *
     */
-    @Select("select * from b_release_value  where  del_flag != 1 and flag = 1 and corp_id = #{corpId}")
+    @Select("<script>" +
+            "select * from b_release_value  " +
+            " where  del_flag != 1 and flag = 1 " +
+            " and corp_id = #{corpId} " +
+            "<if test=\"title!=null and title != ''\"> and title like concat('%',#{title},'%')  </if> " +
+            "<if test=\"id!=null and id != ''\"> and business_id = #{id} </if> " +
+            "<if test=\"lessonValueStart!=null and lessonValueStart != ''\"> and lesson_value &gt;= #{lessonValueStart}  </if> " +
+            "<if test=\"lessonValueEnd!=null and lessonValueEnd != ''\"> and lesson_value &lt;= #{lessonValueEnd}  </if> " +
+            "<if test=\"trainValueStart!=null and trainValueStart != ''\"> and train_value &gt;= #{trainValueStart}  </if> " +
+            "<if test=\"trainValueEnd!=null and trainValueEnd != ''\"> and train_value &lt;= #{trainValueEnd}  </if> " +
+            " ORDER BY corp_id " +
+            "<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '0'.toString()\"> ,lesson_value asc </if> " +
+            "<if test=\"lessonSort!=null and lessonSort != '' and lessonSort == '1'.toString()\"> ,lesson_value desc </if> " +
+            "<if test=\"trainSort!=null and trainSort != '' and trainSort == '0'.toString()\"> ,train_value asc </if> " +
+            "<if test=\"trainSort!=null and trainSort != '' and trainSort == '1'.toString()\"> ,train_value desc </if> " +
+            "<if test=\"timeSort!=null and timeSort != '' and timeSort == '0'.toString()\"> ,update_date asc </if> " +
+            "<if test=\"timeSort!=null and timeSort != '' and timeSort == '1'.toString()\"> ,update_date desc </if> " +
+            "</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BReleaseValue> queryBReleaseValues(String corpId);
+    List<BReleaseValue> queryBReleaseValues(ReleaseValueResDto dto);
 
     /**
      * 插入子表
@@ -105,24 +120,33 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
 
     /**
      * 查询用户积分信息
-     * @param name
-     * @param corpId
+     * @param dto
      * @param userList
      * @return
      */
-    @Select("<script>select business_id, name , `value` " +
+    @Select("<script>select business_id, name , `value`  ," +
+            "(select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) valueGain " +
             " from s_user   " +
-            " where 1=1 " +
-            " and del_flag !=1  " +
-            " and flag = 1 " +
-            " and corp_id = #{corpId} " +
-            "<if test=\"name!=null and name != ''\"> and name like concat('%',#{name},'%')</if>" +
+            " where 1=1   and del_flag !=1    and flag = 1  " +
+            " and corp_id = #{dto.corpId} " +
             "<if test=\"userList!=null and userList.size() > 0 \"> " +
             " and business_id in <foreach item='item' index='index' collection='userList' open='(' separator=',' close=')'> #{item} </foreach>" +
             "</if>" +
+            "<if test=\"dto.name!=null and dto.name != ''\"> and name like concat('%',#{dto.name},'%') </if> " +
+            "<if test=\"dto.nowValueStart!=null and dto.nowValueStart != ''\"> and value &gt;= #{dto.nowValueStart}  </if> " +
+            "<if test=\"dto.nowValueEnd!=null and dto.nowValueEnd != ''\"> and value &lt;= #{dto.nowValueEnd}  </if> " +
+            "<if test=\"dto.gainValueStart!=null and dto.gainValueStart != ''\">" +
+            "   and (select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) &gt;= #{dto.gainValueStart}  </if> " +
+            "<if test=\"dto.gainValueEnd!=null and dto.gainValueEnd != ''\"> " +
+            "   and (select sum(value) from b_person_value where person_id = s_user.business_id and type = 0) &lt;= #{dto.gainValueEnd}  </if> " +
+            "ORDER BY corp_id " +
+            "<if test=\"dto.nowValueSort!=null and dto.nowValueSort != '' and dto.nowValueSort == '0'.toString()\"> ,value asc  </if> " +
+            "<if test=\"dto.nowValueSort!=null and dto.nowValueSort != '' and dto.nowValueSort == '1'.toString()\"> ,value desc  </if> " +
+            "<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '0'.toString()\"> ,valueGain asc  </if> " +
+            "<if test=\"dto.gainValueSort!=null and dto.gainValueSort != '' and dto.gainValueSort == '1'.toString()\"> ,valueGain desc  </if> " +
             " </script>")
-    @ResultMap(value = "UserValueDtoMap")
-    List<UserValueDto> getUserValue(@Param("name") String name, @Param("corpId")String corpId, @Param("userList")List<String> userList);
+//    @ResultMap(value = "UserValueDtoMap")
+    List<UserValueDto> getUserValue(@Param("dto") UserValueResDto dto, @Param("userList")List<String> userList);
 
     /**
      * xml中引用
@@ -131,5 +155,15 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
      */
     @Select("select sum(value) valueConsume from b_person_value where type = 1 and del_flag !=1 and flag = 1 and person_id = #{businessId}")
     String getValueConsume(@Param("businessId")String businessId);
+
+    @Select("<script>" +
+            "select rv.business_id from b_release_value  rv " +
+            "left join b_release_value_son  rvs on rv.business_id = rvs.release_id " +
+            "left join s_user su  on su.business_id = rvs.user_id " +
+            "where  rv.del_flag != 1 and rv.flag = 1  " +
+            "and su.name like concat('%',#{name},'%')" +
+            "and rv.corp_id = #{corpId}" +
+            "</script>")
+    String getReleaseId (@Param("name") String name,@Param("corpId")String corpId);
 }
 

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

+package org.rcisoft.business.breleasevalue.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ReleaseValueResDto {
+
+    @ApiModelProperty(value = "分组标题")
+    public String title;
+
+    @ApiModelProperty(value = "人员姓名")
+    public String name;
+
+    @ApiModelProperty(value = "课程奖励起始")
+    public String lessonValueStart;
+
+    @ApiModelProperty(value = "课程奖励截止")
+    public String lessonValueEnd;
+
+    @ApiModelProperty(value = "培训奖励起始")
+    public String trainValueStart;
+
+    @ApiModelProperty(value = "培训奖励截止")
+    public String trainValueEnd;
+
+    @ApiModelProperty(value = "课程时间排序 0正序 1倒序")
+    public String lessonSort;
+
+    @ApiModelProperty(value = "培训时间排序 0正序 1倒序")
+    public String trainSort;
+
+    @ApiModelProperty(value = "更新时间排序 0正序 1倒序")
+    public String timeSort;
+
+    @ApiModelProperty(value = "企业id")
+    public String corpId;
+
+    @ApiModelProperty(value = "不用传")
+    public String id;
+
+}

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

@@ -13,5 +13,5 @@ public class UserValueDto {
 
     public String value;
 
-    public String valueConsume;
+    public String valueGain;
 }

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

@@ -5,7 +5,6 @@ import lombok.Data;
 
 @Data
 public class UserValueResDto {
-
     @ApiModelProperty(value = "用户名")
     public String name;
 
@@ -15,13 +14,22 @@ public class UserValueResDto {
     @ApiModelProperty(value = "当前积分起始")
     public String nowValueStart;
 
-    @ApiModelProperty(value = "当前积分截至")
+    @ApiModelProperty(value = "当前积分截止")
     public String nowValueEnd;
 
     @ApiModelProperty(value = "获取积分起始")
     public String gainValueStart;
 
-    @ApiModelProperty(value = "获取积分截至")
+    @ApiModelProperty(value = "获取积分截止")
     public String gainValueEnd;
 
+    @ApiModelProperty(value = "当前积分排序 0正序 1 倒序")
+    public String nowValueSort;
+
+    @ApiModelProperty(value = "获取积分排序 0正序 1 倒序")
+    public String gainValueSort;
+
+    @ApiModelProperty(value = "企业id")
+    public String corpId;
+
 }

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

@@ -2,10 +2,7 @@ package org.rcisoft.business.breleasevalue.service;
 
 import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
 import org.rcisoft.business.bbanner.entity.BBanner;
-import org.rcisoft.business.breleasevalue.dto.BReleaseValueDto;
-import org.rcisoft.business.breleasevalue.dto.LessonValueDto;
-import org.rcisoft.business.breleasevalue.dto.LessonValueSettingQueryDto;
-import org.rcisoft.business.breleasevalue.dto.UserValueDto;
+import org.rcisoft.business.breleasevalue.dto.*;
 import org.rcisoft.business.breleasevalue.entity.BReleaseValue;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
@@ -20,7 +17,7 @@ public interface BReleaseValueService {
 
     PersistModel save (BReleaseValueDto bReleaseValueDto);
 
-    List<BReleaseValue> queryByPagination(PageUtil pageUtil, String corpId);
+    List<BReleaseValue> queryByPagination(PageUtil pageUtil, ReleaseValueResDto dto);
 
     PersistModel delete (String businessId ,String corpId);
 
@@ -28,5 +25,5 @@ public interface BReleaseValueService {
 
     PersistModel updateLessonValue (String businessId, String valueConsume,String valueGain);
 
-    List<UserValueDto> queryUserValueByPagination(PageUtil pageUtil, String name, String corpId, String dept);
+    List<UserValueDto> queryUserValueByPagination(PageUtil pageUtil, UserValueResDto dto);
 }

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

 package org.rcisoft.business.breleasevalue.service.impl;
 
-import org.rcisoft.business.breleasevalue.dto.BReleaseValueDto;
-import org.rcisoft.business.breleasevalue.dto.LessonValueDto;
-import org.rcisoft.business.breleasevalue.dto.LessonValueSettingQueryDto;
-import org.rcisoft.business.breleasevalue.dto.UserValueDto;
+import org.rcisoft.business.breleasevalue.dto.*;
 import org.rcisoft.business.breleasevalue.entity.BReleaseValueSon;
 import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
 import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
@@ -75,8 +72,12 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
     }
 
     @Override
-    public List<BReleaseValue> queryByPagination(PageUtil pageUtil, String corpId) {
-        List<BReleaseValue> list = bReleaseValueRepository.queryBReleaseValues(corpId);
+    public List<BReleaseValue> queryByPagination(PageUtil pageUtil, ReleaseValueResDto dto) {
+        if(dto.getName() != null && !"".equals(dto.getName())){
+            String id  = bReleaseValueRepository.getReleaseId(dto.name,dto.getCorpId());
+            dto.setId(id);
+        }
+        List<BReleaseValue> list = bReleaseValueRepository.queryBReleaseValues(dto);
         return list;
     }
 
@@ -117,22 +118,22 @@ public class BReleaseValueServiceImpl implements BReleaseValueService {
     }
 
     @Override
-    public List<UserValueDto> queryUserValueByPagination(PageUtil pageUtil, String name, String corpId, String dept) {
+    public List<UserValueDto> queryUserValueByPagination(PageUtil pageUtil, UserValueResDto userValueResDto) {
         List<String> deptList = new ArrayList<>();
-        if(dept!=null){
+        if(userValueResDto.getDept()!=null){
             Set<String> deptSets = new HashSet<>();
-            deptSets.add(dept);
-            deptList= mtCotactApiRequestClient.getSubUserIdsByDeptIds(corpId, deptSets);
+            deptSets.add(userValueResDto.getDept());
+            deptList= mtCotactApiRequestClient.getSubUserIdsByDeptIds(userValueResDto.getCorpId(), deptSets);
         }
 
-        List<UserValueDto> users = bReleaseValueRepository.getUserValue(name, corpId, deptList);
+        List<UserValueDto> users = bReleaseValueRepository.getUserValue(userValueResDto, deptList);
 
         List<String> list = new ArrayList<>();
         for (UserValueDto user : users) {
             list.add(user.getBusinessId());
         }
         MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
-        mtUserGetsReqDTO.setCorpId(corpId);
+        mtUserGetsReqDTO.setCorpId(userValueResDto.getCorpId());
         mtUserGetsReqDTO.setIds(list);
         List<MTUserInfoRspDTO> depart = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
         if (depart != null) {

src/main/resources/mapper/business/breleasevalue/mapper/BReleaseValueMapper.xml

@@ -20,16 +20,16 @@
             </collection>
     </resultMap>
 
-        <resultMap id="UserValueDtoMap" type="org.rcisoft.business.breleasevalue.dto.UserValueDto">
-            <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
-            <result column="dept" jdbcType="INTEGER" property="dept"/>
-            <result column="name" jdbcType="INTEGER" property="name"/>
-            <result column="value" jdbcType="VARCHAR" property="value"/>
-            <collection property="valueConsume" ofType="org.rcisoft.business.breleasevalue.dto.UserValueDto"
-                        javaType="String" select="org.rcisoft.business.breleasevalue.dao.BReleaseValueRepository.getValueConsume"
-                        column="business_id">
-            </collection>
-    </resultMap>
+<!--        <resultMap id="UserValueDtoMap" type="org.rcisoft.business.breleasevalue.dto.UserValueDto">-->
+<!--            <id column="business_id" jdbcType="VARCHAR" property="businessId"/>-->
+<!--            <result column="dept" jdbcType="INTEGER" property="dept"/>-->
+<!--            <result column="name" jdbcType="INTEGER" property="name"/>-->
+<!--            <result column="value" jdbcType="VARCHAR" property="value"/>-->
+<!--            <collection property="valueConsume" ofType="org.rcisoft.business.breleasevalue.dto.UserValueDto"-->
+<!--                        javaType="String" select="org.rcisoft.business.breleasevalue.dao.BReleaseValueRepository.getValueConsume"-->
+<!--                        column="business_id">-->
+<!--            </collection>-->
+<!--    </resultMap>-->
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
 </mapper>
\ No newline at end of file