Merge remote-tracking branch 'origin/master'

@@ -79,6 +79,28 @@ public class DocumentManageController {
 		return result;
 	}
 
+	 /**
+	  * 分页列表查询
+	  * @param documentManageVO
+	  * @param pageNo
+	  * @param pageSize
+	  * @return
+	  */
+	 @AutoLog(value = "智慧图书馆-分页列表查询")
+	 @ApiOperation(value="智慧图书馆-分页列表查询", notes="智慧图书馆-分页列表查询")
+	 @GetMapping(value = "/educationList")
+	 public Result<IPage<DocumentManageVO>> queryPageEducationdataList(DocumentManageVO documentManageVO,
+																   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 documentManageVO.setDocuType("education");
+		 Result<IPage<DocumentManageVO>> result = new Result<IPage<DocumentManageVO>>();
+		 Page<DocumentManageVO> pageList = new Page<DocumentManageVO>(pageNo,pageSize);
+		 pageList = documentManageService.queryCustomPageList(pageList,documentManageVO);//自定义查询
+		 result.setSuccess(true);
+		 result.setResult(pageList);
+		 return result;
+	 }
+
 	@AutoLog(value = "智慧图书馆-分页列表查询")
 	@ApiOperation(value="智慧图书馆-分页列表查询", notes="智慧图书馆-分页列表查询")
 	@GetMapping(value = "/contractList")

@@ -62,5 +62,11 @@
         <if test="materialInfo.rulesType!=null and materialInfo.rulesType!=''">
             and rules_type like CONCAT(CONCAT('%', #{materialInfo.rulesType}),'%')
         </if>
+        <if test="materialInfo.lawsType!=null and materialInfo.lawsType!=''">
+            and laws_type like CONCAT(CONCAT('%', #{materialInfo.lawsType}),'%')
+        </if>
+        <if test="materialInfo.standardsType!=null and materialInfo.standardsType!=''">
+            and standards_type like CONCAT(CONCAT('%', #{materialInfo.standardsType}),'%')
+        </if>
     </select>
 </mapper>

@@ -33,22 +33,46 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
 		String dictCode = "rules_type";//标准规范：bzgf	法律法规：flfg 公司制度章程：gzzd
 		if("gzzd".equals(facInfo.getFacInformationtype())){
 			dictCode = "rules_type";
+			List<Map<String, Object>> typeList = baseMapper.getAnalysis(dictCode);
+			for (Map<String, Object> map : typeList) {
+				String type = map.get("id").toString();
+				int count = 0;
+				for(MaterialInfo materialInfo: list){
+					if(materialInfo.getRulesType().contains(type)){
+						count++;
+					}
+				}
+				map.put("count",count);
+				tList.add(map);
+			}
 		}else if("bzgf".equals(facInfo.getFacInformationtype())){
 			dictCode = "standards_type";
+			List<Map<String, Object>> typeList = baseMapper.getAnalysis(dictCode);
+			for (Map<String, Object> map : typeList) {
+				String type = map.get("id").toString();
+				int count = 0;
+				for(MaterialInfo materialInfo: list){
+					if(materialInfo.getStandardsType().contains(type)){
+						count++;
+					}
+				}
+				map.put("count",count);
+				tList.add(map);
+			}
 		}else if("flfg".equals(facInfo.getFacInformationtype())){
 			dictCode = "laws_type";
-		}
-		List<Map<String, Object>> typeList = baseMapper.getAnalysis(dictCode);
-		for (Map<String, Object> map : typeList) {
-			String type = map.get("id").toString();
-			int count = 0;
-			for(MaterialInfo materialInfo: list){
-				if(materialInfo.getRulesType().contains(type)){
-					count++;
+			List<Map<String, Object>> typeList = baseMapper.getAnalysis(dictCode);
+			for (Map<String, Object> map : typeList) {
+				String type = map.get("id").toString();
+				int count = 0;
+				for(MaterialInfo materialInfo: list){
+					if(materialInfo.getLawsType().contains(type)){
+						count++;
+					}
 				}
+				map.put("count",count);
+				tList.add(map);
 			}
-			map.put("count",count);
-			tList.add(map);
 		}
         return tList;
     }

@@ -154,8 +154,8 @@ public class ReportDataController {
         return Result.ok(valueMap);
     }
 
-    @AutoLog(value = "运营周报展示")
-    @ApiOperation(value = "运营周报展示", notes = "运营周报展示")
+    @AutoLog(value = "运营周报word展示")
+    @ApiOperation(value = "运营周报word展示", notes = "运营周报word展示")
     @GetMapping(value = "/reportWeekShow")
     public Result<Map<String,Object>> reportWeekShow(HttpServletRequest req) {
         Result<Map<String,Object>> result = new Result<>();