--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/school/sysuser/fg/schoollibrary/QuerySchoolAsedLibraryForm.java

@@ -16,5 +16,14 @@ public class QuerySchoolAsedLibraryForm {
 	private String type;
 	@ApiModelProperty("前台token")
 	private String token;
+	@ApiModelProperty("省份")
+	private String province;
+	@ApiModelProperty("市份")
+	private String city;
+	@ApiModelProperty("教材名称/isbn")
+	private String complex;
+	@ApiModelProperty("排序条件 0:订购数量   1:使用学校数量")
+	private Integer sort;
+	
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/schoolbooklibrary/SchoolAsedLibraryVo.java

+package com.zrqx.core.vo.schoolsysuser.fg.schoolbooklibrary;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "SchoolAsedLibraryVo", description = "大后台-校本库分页列表vo")
+public class SchoolAsedLibraryVo {
+	
+	@ApiModelProperty("id")
+	private String id;
+	
+	@ApiModelProperty("学校名称（多个学校，名称用逗号分开）")
+	private String schoolName;
+	
+	@ApiModelProperty("教材名称")
+	private String resourceName;
+	
+	@ApiModelProperty("isbn")
+	private String isbn;
+	
+	@ApiModelProperty("作者")
+	private String author;
+	
+	@ApiModelProperty("添加时间")
+	private Date createTime;
+	
+	@ApiModelProperty("订购数量")
+	private Integer orderNum;
+	
+	@ApiModelProperty("使用学校数量")
+	private Integer num;
+
+}

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/schoolasedlibrary/FgSchoolAsedLibraryController.java

@@ -18,6 +18,7 @@ import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.member.bg.school.QuerySchoolForm;
 import com.zrqx.core.form.school.sysuser.fg.schoollibrary.QuerySchoolAsedLibraryForm;
 import com.zrqx.core.model.member.schoolasedlibrary.SchoolAsedLibrary;
 import com.zrqx.core.util.bean.BeanUtils;
@@ -26,7 +27,10 @@ import com.zrqx.core.util.excelutil.ExcelUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
 import com.zrqx.core.vo.schoolsysuser.fg.schoolbooklibrary.ExcelSchoolAsedLibraryVo;
+import com.zrqx.core.vo.schoolsysuser.fg.schoolbooklibrary.SchoolAsedLibraryVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -98,5 +102,35 @@ public class FgSchoolAsedLibraryController {
 		ExcelUtil.getInstance().exportExcel(voList, ExcelSchoolAsedLibraryVo.class, "校本库.xlsx", response, request);
 		return null;
 	}
+	
+	
+	@ApiOperation(value = "省份列表", notes = "去重之后的省份列表")
+	@GetMapping(value = MemberRequestPath.PROVINCE_LIST)
+	public CallBack<List<String>> listProvince() {
+		// 根据查询项 获取校本库存在的学校的 省份列表 并去重
+		return CallBack.success(fgSchoolAsedLibraryService.listProvince());
+	}
+	
+	
+	@ApiOperation(value = "市份列表", notes = "去重之后的市份列表")
+	@GetMapping(value = MemberRequestPath.CITY_LIST)
+	public CallBack<List<String>> listCity(String province){
+		//  根据查询项  获取校本库存在的学校的 地区列表 并去重
+		return CallBack.success(fgSchoolAsedLibraryService.listCity(province));
+	}
+	
+	@ApiOperation(value = "学校列表", notes = "学校列表")
+	@GetMapping(value = MemberRequestPath.SCHOOL)
+	public CallBack<List<IdAndNameVo>> listSchool(){
+		//  根据查询项  获取校本库存在的学校的 地区列表 并去重
+		return CallBack.success(fgSchoolAsedLibraryService.listSchool());
+	}
+	
+	
+	@ApiOperation(value = "校本库列表(大后台)",notes = "分页查询")
+	@GetMapping(value = MemberRequestPath.PAGE + MemberRequestPath.INFO)
+	public CallBack<PageInfo<SchoolAsedLibraryVo>> pageInfo(PageParam pageParam,QuerySchoolAsedLibraryForm form){
+		return CallBack.success(fgSchoolAsedLibraryService.pageInfo(pageParam,form));
+	}
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/schoolasedlibrary/FgSchoolAsedLibraryMapper.java

@@ -7,10 +7,16 @@ import org.apache.ibatis.annotations.Select;
 import com.zrqx.core.form.school.sysuser.fg.schoollibrary.QuerySchoolAsedLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.schoolasedlibrary.SchoolAsedLibrary;
+import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
+import com.zrqx.core.vo.schoolsysuser.fg.schoolbooklibrary.SchoolAsedLibraryVo;
 
 @Mapper
 public interface FgSchoolAsedLibraryMapper extends BaseMapper<SchoolAsedLibrary> {
 	
+	String DEFAULT_PARAM =  " LEFT JOIN school_order_info oi ON oi.resourceId = l.id "
+			+ "LEFT JOIN school_order_info_status ois ON ois.orderInfoId = oi.id "
+			+ " where 1=1 AND oi.resourceId is not NULL and ois.`status` = 5 ";
+	
 	@Select(" <script> "
 			+ " select * from me_school_ased_library m "
 			+ " WHERE  1=1 "
@@ -25,5 +31,99 @@ public interface FgSchoolAsedLibraryMapper extends BaseMapper<SchoolAsedLibrary>
 		    + " </if> " 
 		    + " </script> ")
 	List<SchoolAsedLibrary> list(@Param("query") QuerySchoolAsedLibraryForm query);
+	
+	
+	
+	/**
+	 * 省份列表
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午3:51:57
+	 */
+	@Select("<script>"
+			+ " SELECT s.province from me_school_ased_library l LEFT JOIN `jgjy-member`.me_school s ON l.relationId = s.id    "
+			+ DEFAULT_PARAM
+			+ " GROUP BY s.province "
+			+ " HAVING s.province is not NULL "
+			+ "</script>")
+	List<String> listProvince();
+	
+	/**
+	 * 市份列表
+	 * @param province
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午3:52:09
+	 */
+	@Select("<script>"
+			+ " SELECT s.city from me_school_ased_library l LEFT JOIN `jgjy-member`.me_school s ON l.relationId = s.id    "
+			+ DEFAULT_PARAM
+			+ " eq(s.province,province) "
+			+ " GROUP BY s.city "
+			+ " HAVING s.city is not NULL "
+			+ "</script>")
+	List<String> listCity(@Param("province")String province);
+	
+	/**
+	 * 学校列表
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午3:52:47
+	 */
+	@Select("<script>"
+			+ " SELECT relationId as id from me_school_ased_library l  "
+			+ DEFAULT_PARAM
+			+ " GROUP BY l.relationId "
+			+ " HAVING l.relationId is not NULL "
+			+ "</script>")
+	List<IdAndNameVo> listSchool();
+	
+	
+	/**
+	 * 大后台（订单列表）
+	 * @param form
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午4:36:45
+	 */
+	@Select("<script>"
+			+ " SELECT l.id,s.address,s.province,s.city,s.`name`,l.resourceName,l.auther,l.isbn,l.createTime,COUNT(l.isbn) as num,sum(oi.num) as orderNum "
+			+ " from me_school_ased_library l "
+			+ " LEFT JOIN `jgjy-member`.me_school s ON l.relationId = s.id  "
+			+ " LEFT JOIN school_order_info oi ON oi.resourceId = l.id  "
+			+ " LEFT JOIN school_order_info_status ois ON ois.orderInfoId = oi.id "
+			+ " where 1=1 and oi.resourceId is not NULL and ois.`status` = 5 "
+			//省
+			+ " eq(s.province,form.province) "
+			//市
+			+ " eq(s.city,form.city) "
+			//学校
+			+ " eq(l.relationId,form.relationId) "
+			//综合查询
+			+ " <if test = '" + NOTBLANK + "(form.complex)'> "
+            + " and ( l.resourceName =  #{form.complex} or l.isbn = #{form.complex} )"
+            + " </if> "
+			+ " GROUP BY l.isbn "
+			+ " HAVING l.isbn is not null "
+			+ " <if test = ' form.sort == 0 '> "
+            + " ORDER by orderNum desc "
+            + " </if> "
+            + " <if test = ' form.sort == 1 '> "
+            + " ORDER by num desc "
+            + " </if> "
+			+ "</script>")
+	List<SchoolAsedLibraryVo> pageInfo(@Param("form")QuerySchoolAsedLibraryForm form);
+	
+	
+	@Select("<script>"
+			+ " SELECT s.name from school_order_info oi LEFT JOIN school_order_info_status ois ON ois.orderInfoId = oi.id   "
+			+ " LEFT JOIN school_order o ON o.id =  oi.orderId "
+			+ " LEFT JOIN `jgjy-member`.me_school s ON o.relationId = s.id  "
+			+ " where 1=1 and ois.`status` = 5 "
+			+ " eq(oi.resourceId,resourceId) "
+			+ " GROUP BY o.relationId "
+			+ " HAVING o.relationId is not NULL "
+			+ "</script>")
+	List<String> queryByResourceId(@Param("resourceId")String resourceId);
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/schoolasedlibrary/FgSchoolAsedLibraryService.java

@@ -6,6 +6,8 @@ import com.zrqx.core.model.member.schoolasedlibrary.SchoolAsedLibrary;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
+import com.zrqx.core.vo.schoolsysuser.fg.schoolbooklibrary.SchoolAsedLibraryVo;
 
 public interface FgSchoolAsedLibraryService extends BaseService<SchoolAsedLibrary,String>{
 	
@@ -50,6 +52,42 @@ public interface FgSchoolAsedLibraryService extends BaseService<SchoolAsedLibrar
 	 */
 	boolean isExistName(SchoolAsedLibrary form, SchoolAsedLibrary oldEntity);
 	
+	/**
+	 * 省份列表
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午3:40:41
+	 */
+	List<String> listProvince();
+	
+	/**
+	 * 市份列表
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午3:40:41
+	 */
+	List<String> listCity(String province);
+	
+	
+	/**
+	 * 学校列表
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午3:40:41
+	 */
+	List<IdAndNameVo> listSchool();
+	
+	
+	/**
+	 * 大后台校本库列表
+	 * @param pageParam
+	 * @param form
+	 * @return
+	 * @auther zzg
+	 * @data 2020年1月15日 下午4:05:00
+	 */
+	PageInfo<SchoolAsedLibraryVo> pageInfo(PageParam pageParam,QuerySchoolAsedLibraryForm form);
+	
 	
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/schoolasedlibrary/FgSchoolAsedLibraryServiceImpl.java

@@ -12,11 +12,17 @@ import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.school.sysuser.fg.schoollibrary.QuerySchoolAsedLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.member.school.School;
 import com.zrqx.core.model.member.schoolasedlibrary.SchoolAsedLibrary;
 import com.zrqx.core.service.BaseModelServiceImpl;
+import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.member.fg.member.FgMemberVo;
+import com.zrqx.core.vo.schoolsysuser.fg.IdAndNameVo;
+import com.zrqx.core.vo.schoolsysuser.fg.schoolbooklibrary.SchoolAsedLibraryVo;
+import com.zrqx.school.sysuser.client.BgMemberClient;
 import com.zrqx.school.sysuser.mapper.schoolasedlibrary.FgSchoolAsedLibraryMapper;
 
 @Service
@@ -27,6 +33,8 @@ public class FgSchoolAsedLibraryServiceImpl extends BaseModelServiceImpl<SchoolA
 	private FgSchoolAsedLibraryMapper fgSchoolAsedLibraryMapper;
 	@Autowired
 	private FgRedisManage redis;
+	@Autowired
+	private BgMemberClient bgMemberClient;
 
 	@Override
 	public BaseMapper<SchoolAsedLibrary> getMapper() {
@@ -101,6 +109,51 @@ public class FgSchoolAsedLibraryServiceImpl extends BaseModelServiceImpl<SchoolA
 		}
 		return true;
 	}
+
+	@Override
+	public List<String> listProvince() {
+		List<String> list = fgSchoolAsedLibraryMapper.listProvince();
+		return list;
+	}
+
+	@Override
+	public List<String> listCity(String province) {
+		List<String> list = fgSchoolAsedLibraryMapper.listCity(province);
+		return list;
+	}
+
+	@Override
+	public List<IdAndNameVo> listSchool() {
+		List<IdAndNameVo> list = fgSchoolAsedLibraryMapper.listSchool();
+		//远程调用获取学校名称
+		list.forEach(vo ->{
+			CallBack<School> callBack = bgMemberClient.getByOid(vo.getId());
+			if(callBack != null && callBack.getData() != null){
+				vo.setName(callBack.getData().getName());
+			}
+		});
+		return list;
+	}
+
+	@Override
+	public PageInfo<SchoolAsedLibraryVo> pageInfo(PageParam pageParam, QuerySchoolAsedLibraryForm form) {
+		if(StringUtils.isEmpty(pageParam.getOrderBy())){
+			pageParam.setOrderBy(" l.createTime desc ");
+		}
+		startPage(pageParam);
+		List<SchoolAsedLibraryVo> list = fgSchoolAsedLibraryMapper.pageInfo(form);
+		list.forEach(vo ->{
+			String names = null;
+			if(vo.getNum() > 1){
+				List<String> voList = fgSchoolAsedLibraryMapper.queryByResourceId(vo.getId());
+				if(ArrayUtils.isNotEmpty(voList)){
+					names = StringUtils.join(voList.toArray(),",");
+				}
+			}
+			vo.setSchoolName(names);
+		});
+		return new PageInfo<SchoolAsedLibraryVo>(list);
+	}