--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/model/sysuser/content/ContentRelation.java

 package com.zrqx.core.model.sysuser.content;
 
-import java.util.Date;
-import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**

com.zrqx.core/src/main/java/com/zrqx/core/model/sysuser/contribute/ContributeRelation.java

+package com.zrqx.core.model.sysuser.contribute;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.apache.poi.util.Removal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="Contribute",description="投稿管理审核意见关联表")
+@Table(name = "sys_contribute")
+public class ContributeRelation {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	@ApiModelProperty("内容id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("管理员类型")
+	private Integer userType;
+	@ApiModelProperty("审核意见")
+	private String opinion;
+	@ApiModelProperty("审核时间")
+	private Date opinionTime;
+	@ApiModelProperty("投稿id")
+	private String contributeId;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/contribute/FgContributeListVo.java

+package com.zrqx.core.vo.sysuser.fg.contribute;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "FgContributeListVo", description = "列表返回的实体")
+public class FgContributeListVo {
+	@ApiModelProperty("内容id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("视频说明")
+	private String text;
+	@ApiModelProperty("审核状态 1区域管理审核 2中心管理审核 3审核通过 4审核未通过")
+	private Integer status ;
+	@ApiModelProperty("审核状态 1区域管理审核 2中心管理审核 3审核通过 4审核未通过")
+	private String status_zh ;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/contribute/FgContributeOneVo.java

+package com.zrqx.core.vo.sysuser.fg.contribute;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "FgContributeOneVo", description = "查询内容详情的实体")
+public class FgContributeOneVo {
+	
+	
+	@ApiModelProperty("标题")
+	private String title;
+	@ApiModelProperty("视频说明")
+	private String text;
+	@ApiModelProperty("区域管理员审核意见")
+	private String opinion_1;
+	@ApiModelProperty("区域管理员审核时间")
+	private Date opinionTime_1;
+	@ApiModelProperty("区域管理员")
+	private String userType_1;
+	@ApiModelProperty("区域管理员审核意见")
+	private String opinion_2;
+	@ApiModelProperty("区域管理员审核时间")
+	private Date opinionTime_2;
+	@ApiModelProperty("中心管理员")
+	private String userType_2;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/contribute/ContributeController.java

@@ -11,33 +11,30 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.netflix.ribbon.proxy.annotation.Content;
 import com.zrqx.core.constant.BaseRequestPath;
 import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
-import com.zrqx.core.enums.sysuser.SignStatusEnum;
 import com.zrqx.core.enums.sysuser.UserTypeEnum;
 import com.zrqx.core.enums.sysuser.contribute.ContributeEnum;
 import com.zrqx.core.exception.BaseException;
-import com.zrqx.core.form.sysuser.bg.content.BatchUpdateSingnLanguageForm;
 import com.zrqx.core.form.sysuser.bg.contribute.ContributeSelectForm;
 import com.zrqx.core.form.sysuser.bg.contribute.ContributeStatusForm;
 import com.zrqx.core.form.sysuser.bg.contribute.UpdateContributeForm;
-import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
 import com.zrqx.core.model.sysuser.contribute.Contribute;
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
 import com.zrqx.core.model.sysuser.user.User;
 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.sysuser.bg.contribute.ContributeListVo;
 import com.zrqx.core.vo.sysuser.bg.contribute.ContributeOneVo;
+import com.zrqx.sysuser.bg.service.contribute.ContributeRelationService;
 import com.zrqx.sysuser.bg.service.contribute.ContributeService;
 import com.zrqx.sysuser.bg.service.user.UserService;
 import com.zrqx.sysuser.commons.redis.Redis;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import tk.mybatis.mapper.entity.Example;
 
 @RestController
 @RequestMapping(SysUserRequestPath.BG + SysUserRequestPath.CONTRIBUTE)
@@ -50,6 +47,8 @@ public class ContributeController {
 	private UserService userService;
 	@Autowired
 	private Redis redis;
+	@Autowired
+	private ContributeRelationService contributeRelationService;
 	
 	@ApiOperation(value = "更新", notes = "0：成功")
 	@PostMapping(value = SysUserRequestPath.UPDATE)
@@ -70,12 +69,12 @@ public class ContributeController {
 	public CallBack<ContributeOneVo> selectById(@PathVariable String oid) {
 		Contribute contribute = service.selectByPrimaryKey(oid);
 		ContributeOneVo vo = new ContributeOneVo();
+		BeanUtils.copyProperties(contribute, vo);
 		User user = userService.selectByPrimaryKey(contribute.getUserId());
 		vo.setImg(user.getImg());
 		vo.setUserName(user.getUserName());
 		vo.setName(user.getName());
 		vo.setStatus_zh(ContributeEnum.getName(vo.getStatus()));
-		BeanUtils.copyProperties(contribute, vo);
 		return CallBack.success(vo);
 	}
 	@ApiOperation(value = "删除", notes = "删除  ")
@@ -94,14 +93,14 @@ public class ContributeController {
 	public CallBack<Boolean> updateArray(@RequestBody ContributeStatusForm form) {
 		Integer userType = redis.getUser().getUserType();
 		String userName = redis.getUser().getUserName();
+		ContributeRelation relation = new ContributeRelation();
 		for (String oid : form.getIds()) {
 			Contribute contribute = service.selectByPrimaryKey(oid);
-			if(userType.equals(UserTypeEnum.TYPE_2.getCode()) || userType.equals(UserTypeEnum.TYPE_1.getCode())) {
+			if(userType.equals(UserTypeEnum.TYPE_2.getCode())) {
 				if(contribute.getStatus().equals(1)) {
 					throw new BaseException("区域管理员审核审核中!");
 				}
 				contribute.setAuditor(userName);
-				contribute.setOpinionTime(new Date());
 			}else if(userType.equals(UserTypeEnum.TYPE_3.getCode())) {
 				if(!contribute.getStatus().equals(1)) {
 					throw new BaseException("区域管理员已审核");
@@ -109,11 +108,17 @@ public class ContributeController {
 				contribute.setArea_Name(userName);
 			}
 			contribute.setStatus(form.getStatus());
-			//审核未通添加审核意见
-			if(form.getStatus().equals(ContributeEnum.NOT_ADOPT)) {
-				contribute.setOpinion(form.getOpinion());
+			boolean b = service.updateByPrimaryKey(contribute);
+			if (b) {
+				//审核未通添加审核意见
+				if(form.getStatus().equals(ContributeEnum.NOT_ADOPT)) {
+					relation.setOpinion(form.getOpinion());
+				}
+				relation.setOpinionTime(new Date());
+				relation.setContributeId(oid);
+				relation.setUserType(userType);
+				contributeRelationService.insert(relation);
 			}
-			service.updateByPrimaryKey(contribute);
 		}
 		return CallBack.success();
 	}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/contribute/ContributeRelationMapper.java

+package com.zrqx.sysuser.bg.mapper.contribute;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.form.sysuser.bg.contribute.ContributeSelectForm;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.contribute.Contribute;
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
+import com.zrqx.core.vo.sysuser.bg.contribute.ContributeListVo;
+
+
+
+@Mapper
+public interface ContributeRelationMapper extends BaseMapper<ContributeRelation> {
+
+	
+}
+

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/contribute/ContributeRelationService.java

+package com.zrqx.sysuser.bg.service.contribute;
+
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
+import com.zrqx.core.service.BaseService;
+
+
+public interface ContributeRelationService extends BaseService<ContributeRelation, String> {
+	
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/contribute/ContributeRelationServiceImpl.java

+package com.zrqx.sysuser.bg.service.contribute;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.bg.mapper.contribute.ContributeRelationMapper;
+
+
+@Service
+public class ContributeRelationServiceImpl extends BaseServiceImpl<ContributeRelation, String> implements ContributeRelationService {
+
+	@Autowired
+	private ContributeRelationMapper mapper;
+	
+	@Override
+	public BaseMapper<ContributeRelation> getMapper() {
+		return mapper;
+	}
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/contribute/FgContributeController.java

 package com.zrqx.sysuser.fg.controller.contribute;
 
 import java.util.Date;
+import java.util.List;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,28 +12,26 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.zrqx.core.constant.BaseRequestPath;
-import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.sysuser.UserTypeEnum;
 import com.zrqx.core.enums.sysuser.contribute.ContributeEnum;
-import com.zrqx.core.exception.BaseException;
-import com.zrqx.core.form.sysuser.bg.contribute.ContributeSelectForm;
-import com.zrqx.core.form.sysuser.bg.contribute.ContributeStatusForm;
+import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.sysuser.fg.contribute.SaveContributeForm;
 import com.zrqx.core.model.sysuser.contribute.Contribute;
-import com.zrqx.core.model.sysuser.user.User;
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
 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.sysuser.bg.contribute.ContributeListVo;
-import com.zrqx.core.vo.sysuser.bg.contribute.ContributeOneVo;
+import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeListVo;
+import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeOneVo;
 import com.zrqx.sysuser.bg.service.user.UserService;
 import com.zrqx.sysuser.commons.redis.Redis;
+import com.zrqx.sysuser.fg.service.contribute.FgContributeRelationService;
 import com.zrqx.sysuser.fg.service.contribute.FgContributeService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
 
 @RestController
 @RequestMapping(SysUserRequestPath.FG + SysUserRequestPath.CONTRIBUTE)
@@ -42,81 +41,61 @@ public class FgContributeController {
 	@Autowired
 	private FgContributeService service;
 	@Autowired
+	private FgContributeRelationService fgContributeRelationService;
+	@Autowired
 	private UserService userService;
 	@Autowired
 	private Redis redis;
 	
-	@ApiOperation(value = "更新", notes = "0：成功")
+	@ApiOperation(value = "更新", notes = "0：成功 1：投稿条数上限！")
 	@PostMapping(value = SysUserRequestPath.UPDATE)
 	public CallBack<Boolean> save(@RequestBody SaveContributeForm form) {
 		String userId = redis.getUser().getUserId();
 		String userName = redis.getUser().getUserName();
-		Contribute contibute = new Contribute();
-		/*Example example = service.createExample();
-		example.createCriteria().andEqualTo("text", form.getText());
-		if(service.selectOneByExample(example) != null){
-			throw new BusinessValidateException(1,"标题名已存在");
-		}*/
-		BeanUtils.copyProperties(form, contibute);
-		contibute.setUploadTime(new Date());
-		contibute.setUserId(userId);
-		contibute.setUserName(userName);
-		service.insert(contibute);
+		Example example = service.createExample();
+		//查询出当前用户投稿条数，5条内没审核不能再次投稿
+		example.createCriteria().andEqualTo("userId", userId).andEqualTo("status", ContributeEnum.NOT_REVIEW).orEqualTo("status", ContributeEnum.IN_REVIEW);
+		int count = service.selectCountByExample(example);
+		if(count<5) {
+			Contribute contibute = new Contribute();
+			BeanUtils.copyProperties(form, contibute);
+			contibute.setUploadTime(new Date());
+			contibute.setUserId(userId);
+			contibute.setUserName(userName);
+			service.insert(contibute);
+		}else {
+			throw new BusinessValidateException(1, "投稿条数上限！");
+		}
 		return CallBack.success(true);
 	}
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping(value = SysUserRequestPath.PAGE)
-	public CallBack<PageInfo<ContributeListVo>> page(ContributeSelectForm form, PageParam pageParam) {
-		return CallBack.success(service.page(form, pageParam));
+	public CallBack<PageInfo<FgContributeListVo>> page(PageParam pageParam) {
+		return CallBack.success(service.page(pageParam));
 	}
 	@ApiOperation(value = "根据ID查看内容详情", notes = "根据ID查看内容详情")
 	@GetMapping(value = SysUserRequestPath.OID)
-	public CallBack<ContributeOneVo> selectById(@PathVariable String oid) {
+	public CallBack<FgContributeOneVo> selectById(@PathVariable String oid) {
 		Contribute contribute = service.selectByPrimaryKey(oid);
-		ContributeOneVo vo = new ContributeOneVo();
-		User user = userService.selectByPrimaryKey(contribute.getUserId());
-		vo.setImg(user.getImg());
-		vo.setUserName(user.getUserName());
-		vo.setName(user.getName());
-		vo.setStatus_zh(ContributeEnum.getName(vo.getStatus()));
+		FgContributeOneVo vo = new FgContributeOneVo();
 		BeanUtils.copyProperties(contribute, vo);
-		return CallBack.success(vo);
-	}
-	@ApiOperation(value = "删除", notes = "删除  ")
-	@PostMapping(value = BaseRequestPath.DELETE_OID)
-	public CallBack<Boolean> updateById(@PathVariable String oid) {
-		if (oid == null) {
-			throw new BaseException("没有选中任何数据，请重新选择");
-		}
-		Contribute contribute = service.selectByPrimaryKey(oid);
-		service.delete(contribute);
-		return CallBack.success();
-	}
-	
-	@ApiOperation(value = "投稿审核", notes = "投稿批量/单个审核")
-	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_REVIEW)
-	public CallBack<Boolean> updateArray(@RequestBody ContributeStatusForm form) {
-		Integer userType = redis.getUser().getUserType();
-		for (String oid : form.getIds()) {
-			Contribute contribute = service.selectByPrimaryKey(oid);
-			if(userType.equals(UserTypeEnum.TYPE_2.getCode()) || userType.equals(UserTypeEnum.TYPE_1.getCode())) {
-				if(contribute.getStatus().equals(1)) {
-					throw new BaseException("区域管理员审核审核中!");
-				}
-			}else if(userType.equals(UserTypeEnum.TYPE_3.getCode())) {
-				if(!contribute.getStatus().equals(1)) {
-					throw new BaseException("区域管理员已审核");
-				}
+		Example example = fgContributeRelationService.createExample();
+		example.createCriteria().andEqualTo("contributeId", oid);
+		List<ContributeRelation> list = fgContributeRelationService.selectByExample(example);
+		for (ContributeRelation contributeRelation : list) {
+			if(contributeRelation.getUserType().equals(UserTypeEnum.TYPE_2)) {
+				vo.setOpinion_2(contributeRelation.getOpinion());
+				vo.setOpinionTime_2(contributeRelation.getOpinionTime());
+				vo.setUserType_2("中心管理员");
+			}else if(contributeRelation.getUserType().equals(UserTypeEnum.TYPE_3)){
+				vo.setOpinion_1(contributeRelation.getOpinion());
+				vo.setOpinionTime_1(contributeRelation.getOpinionTime());
+				vo.setUserType_1("区域管理员");
 			}
-			contribute.setStatus(form.getStatus());
-			//审核未通添加审核意见
-			if(form.getStatus().equals(ContributeEnum.NOT_ADOPT)) {
-				contribute.setOpinion(form.getOpinion());
-			}
-			service.updateByPrimaryKey(contribute);
 		}
-		return CallBack.success();
+		return CallBack.success(vo);
 	}
+
 	/**
 	 * 去标签
 	 * @param list

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/contribute/FgContributeMapper.java

@@ -6,10 +6,10 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import com.zrqx.core.form.sysuser.bg.contribute.ContributeSelectForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.sysuser.contribute.Contribute;
-import com.zrqx.core.vo.sysuser.bg.contribute.ContributeListVo;
+import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeListVo;
+
 
 
 
@@ -17,31 +17,13 @@ import com.zrqx.core.vo.sysuser.bg.contribute.ContributeListVo;
 public interface FgContributeMapper extends BaseMapper<Contribute> {
 	/** 分页查询*/
 	@Select("<script>" 
-			+ "SELECT cc.id,cc.text,cc.userName,DATE_FORMAT(cc.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
-			+ "cc.title,cc.area_Name,cc.status,cc.video FROM sys_contribute cc where 1=1 "
-			+ "<if test='"+ NOTBLANK +"(form.text)'>"
-    		+ "and cc.text like concat('%',#{form.text},'%') and cc.userName = #{form.text}"
-	    	+ "</if>" 
-	    	+ "<if test='"+ NOTBLANK +"(form.status)'>"
-    		+ "	and cc.status = #{form.text}"
-    		+ "</if>" 
-			+ "</script>")
-	List<ContributeListVo> page(@Param("form")ContributeSelectForm form);
-	/** 分页查询*/
-	@Select("<script>" 
-			+ "SELECT cc.id,cc.text,cc.userName,DATE_FORMAT(cc.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
-			+ "cc.title,cc.area_Name,cc.area_adminId,cc.status,cc.video FROM sys_contribute cc where 1=1 "
-			+ "<if test='"+ NOTBLANK +"(form.text)'>"
-    		+ "and cc.text like concat('%',#{form.text},'%') and cc.userName = #{form.text}"
-	    	+ "</if>" 
-	    	+ "<if test='"+ NOTBLANK +"(form.status)'>"
-    		+ "	and cc.status = #{form.text}"
-    		+ "</if>" 
-    		+ "<if test='"+ NOTBLANK +"(form.userId)'>"
-    		+ " and cc.area_adminId = #{userId} "
+			+ "SELECT cc.id,cc.text,cc.userId,DATE_FORMAT(cc.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
+			+ "cc.status,cc.video FROM sys_contribute cc where 1=1 "
+    		+ "<if test='"+ NOTBLANK +"(userId)'>"
+    		+ " and cc.userId = #{userId} "
     		+ "</if>"
 			+ "</script>")
-	List<ContributeListVo> pageOrUserType(@Param("form")ContributeSelectForm form);
+	List<FgContributeListVo> page(@Param("userId")String userId);
 	
 }
 

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/contribute/FgContributeRelationMapper.java

+package com.zrqx.sysuser.fg.mapper.contribute;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
+
+
+
+@Mapper
+public interface FgContributeRelationMapper extends BaseMapper<ContributeRelation> {
+
+	
+}
+

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/contribute/FgContributeRelationService.java

+package com.zrqx.sysuser.fg.service.contribute;
+
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
+import com.zrqx.core.service.BaseService;
+
+
+public interface FgContributeRelationService extends BaseService<ContributeRelation, String> {
+	
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/contribute/FgContributeRelationServiceImpl.java

+package com.zrqx.sysuser.fg.service.contribute;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.contribute.ContributeRelation;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.fg.mapper.contribute.FgContributeRelationMapper;
+
+
+@Service
+public class FgContributeRelationServiceImpl extends BaseServiceImpl<ContributeRelation, String> implements FgContributeRelationService {
+
+	@Autowired
+	private FgContributeRelationMapper mapper;
+	
+	@Override
+	public BaseMapper<ContributeRelation> getMapper() {
+		return mapper;
+	}
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/contribute/FgContributeService.java

 package com.zrqx.sysuser.fg.service.contribute;
 
-import java.util.List;
-
-import com.zrqx.core.form.sysuser.bg.contribute.ContributeSelectForm;
-import com.zrqx.core.model.sysuser.content.Content;
 import com.zrqx.core.model.sysuser.contribute.Contribute;
 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.sysuser.bg.contribute.ContributeListVo;
+import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeListVo;
 
 
 public interface FgContributeService extends BaseService<Contribute, String> {
-	/** 分页查询*/
-	PageInfo<ContributeListVo> page(ContributeSelectForm form, PageParam pageParam);
+
+	PageInfo<FgContributeListVo> page(PageParam pageParam);
 	
-	/**
-	 * 根据主题id查询词条
-	 * @param signLanguageId
-	 * @return
-	 */
-	List<Content> queryBySignLanguageId(String signLanguageId);
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/contribute/FgContributeServiceImpl.java

@@ -17,6 +17,7 @@ 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.vo.sysuser.bg.contribute.ContributeListVo;
+import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeListVo;
 import com.zrqx.sysuser.bg.mapper.contribute.ContributeMapper;
 import com.zrqx.sysuser.commons.redis.Redis;
 import com.zrqx.sysuser.fg.mapper.contribute.FgContributeMapper;
@@ -34,28 +35,7 @@ public class FgContributeServiceImpl extends BaseServiceImpl<Contribute, String>
 	public BaseMapper<Contribute> getMapper() {
 		return mapper;
 	}
-
-	@Override
-	public PageInfo<ContributeListVo> page(ContributeSelectForm form, PageParam pageParam) {
-		startPage(pageParam);
-		String userId = redis.getUser().getUserId();
-		Integer userType = redis.getUser().getUserType();
-		List<ContributeListVo> list =null; 
-		if(userType.equals(UserTypeEnum.TYPE_2.getCode()) || userType.equals(UserTypeEnum.TYPE_1.getCode())) {
-			list= mapper.page(form);
-		}else if(userType.equals(UserTypeEnum.TYPE_3.getCode()) || userType.equals(UserTypeEnum.TYPE_4.getCode())){
-			form.setUserId(userId);
-			list= mapper.pageOrUserType(form);
-		}
-		list.stream().forEach(li -> li.setStatus_zh(ContributeEnum.getName(li.getStatus())));
-		this.regEx(list);
-		return new PageInfo<ContributeListVo>(list);
-	}
 	
-	/*@Override
-	public List<Content> queryBySignLanguageId(String signLanguageId){
-		return mapper.queryBySignLanguageId(signLanguageId);
-	}*/
 	/**
 	 * 去标签
 	 * @param list
@@ -100,8 +80,13 @@ public class FgContributeServiceImpl extends BaseServiceImpl<Contribute, String>
 	}
 
 	@Override
-	public List<Content> queryBySignLanguageId(String signLanguageId) {
-		// TODO Auto-generated method stub
-		return null;
+	public PageInfo<FgContributeListVo> page(PageParam pageParam) {
+		startPage(pageParam);
+		String userId = redis.getUser().getUserId();
+		Integer userType = redis.getUser().getUserType();
+		List<FgContributeListVo> list = mapper.page(userId);
+		list.stream().forEach(li -> li.setStatus_zh(ContributeEnum.getName(li.getStatus())));
+		return new PageInfo<FgContributeListVo>(list);
 	}
+
 }