--no commit message

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/news/FgNewsController.java

@@ -18,6 +18,7 @@ import com.zrqx.core.model.sysuser.news.News;
 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.fg.news.NewsVo;
 import com.zrqx.fg.sysuser.mapper.news.FgNewsMapper;
 import com.zrqx.fg.sysuser.service.news.FgNewsService;
 
@@ -46,8 +47,8 @@ public class FgNewsController {
 	
 	@ApiOperation("根据资讯id查详情")
 	@GetMapping(SysUserRequestPath.OID)
-	public 	CallBack<News> get(@PathVariable Integer oid){
-		return CallBack.success(fgNewsService.selectByPrimaryKey(oid));
+	public 	CallBack<NewsVo> get(@PathVariable Integer oid){
+		return CallBack.success(fgNewsService.selectByParams(oid));
 	}
 	
 }

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/activity/ActivityApplyServiceImpl.java

 package com.zrqx.fg.sysuser.service.activity;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -11,17 +8,14 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.enums.AuditStatusEnum;
-import com.zrqx.core.enums.sysuser.activity.ActivityStatusEnum;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.base.BaseModel;
 import com.zrqx.core.model.sysuser.AuditRecord;
-import com.zrqx.core.model.sysuser.activity.Activity;
 import com.zrqx.core.model.sysuser.activity.ActivityApply;
 import com.zrqx.core.service.BaseModelServiceImpl;
 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.department.DepartmentMemberVo;
 import com.zrqx.core.vo.member.fg.member.FgMemberVo;
 import com.zrqx.core.vo.sysuser.fg.activity.ActivityApplyVo;
 import com.zrqx.fg.sysuser.client.BgSysUserClient;

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/activity/ActivityServiceImpl.java

 package com.zrqx.fg.sysuser.service.activity;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.commons.redis.FgRedisManage;
-import com.zrqx.core.enums.AuditStatusEnum;
-import com.zrqx.core.enums.sysuser.activity.ActivityStatusEnum;
 import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.model.sysuser.AuditRecord;
 import com.zrqx.core.model.sysuser.activity.Activity;
 import com.zrqx.core.service.BaseServiceImpl;
 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.fg.activity.ActivityApplyVo;
 import com.zrqx.core.vo.sysuser.fg.activity.ActivityVo;
-import com.zrqx.fg.sysuser.client.BgSysUserClient;
 import com.zrqx.fg.sysuser.manage.FgActivityApplyManage;
 import com.zrqx.fg.sysuser.mapper.activity.ActivityApplyMapper;
 import com.zrqx.fg.sysuser.mapper.activity.ActivityMapper;
@@ -38,7 +28,6 @@ public class ActivityServiceImpl extends BaseServiceImpl<Activity, Integer> impl
 	private FgRedisManage fgRedisManage;
 	@Autowired
 	private ActivityApplyMapper activityApplyMapper;
-	
 	@Override
 	public BaseMapper<Activity> getMapper() {
 		return activityMapper;

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/news/FgNewsService.java

@@ -7,7 +7,7 @@ import com.zrqx.core.model.sysuser.news.News;
 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.news.NewsVo;
+import com.zrqx.core.vo.sysuser.fg.news.NewsVo;
 
 public interface FgNewsService extends BaseService<News, Integer>{
 
@@ -30,4 +30,6 @@ public interface FgNewsService extends BaseService<News, Integer>{
 	 */
 	PageInfo<News> page(PageParam pageParam, String columnName);
 
+	NewsVo selectByParams(Integer oid);
+
 }

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/news/FgNewsServiceImpl.java

@@ -5,19 +5,29 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+import com.zrqx.core.commons.redis.FgRedisManage;
 import com.zrqx.core.form.sysuser.fg.news.QueryNewsForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.sysuser.news.News;
+import com.zrqx.core.model.sysuser.news.NewsFeedBack;
 import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.vo.sysuser.bg.news.NewsVo;
+import com.zrqx.core.vo.sysuser.fg.news.NewsVo;
 import com.zrqx.fg.sysuser.mapper.news.FgNewsMapper;
 @Service
 public class FgNewsServiceImpl extends BaseServiceImpl<News, Integer> implements FgNewsService{
 
 	@Autowired
 	private FgNewsMapper fgNewsMapper;
+	@Autowired
+	private FgRedisManage fgRedisManage;
+	@Autowired
+	private FgNewsFeedBackService fgNewsFeedBackService;
 	
 	@Override
 	public BaseMapper<News> getMapper() {
@@ -50,4 +60,35 @@ public class FgNewsServiceImpl extends BaseServiceImpl<News, Integer> implements
 		List<News> list = fgNewsMapper.list(columnName);
 		return new PageInfo<News>(list);
 	}
+
+	/**
+	 * 根据id查询详情
+	 * @see com.zrqx.fg.sysuser.service.news.FgNewsService#selectByParams(java.lang.Integer)
+	 * @param oid
+	 * @return
+	 * @author chyj 
+	 * @date: 2019年5月10日 上午9:35:38
+	 */
+	@Override
+	public NewsVo selectByParams(Integer oid) {
+		News news = fgNewsMapper.selectByPrimaryKey(oid);
+		//转换对象
+		NewsVo vo = new NewsVo();
+		//保存
+		BeanUtils.copyProperties(news, vo);
+		Integer formId = news.getFormId();
+		//判断是否可以反馈  条件：是否反馈过 *是否关联过表单（formId是否为空）
+		NewsFeedBack record = new NewsFeedBack();
+		String id = fgRedisManage.getOpId();
+		String type = fgRedisManage.getMember().getType();
+		record.setMemberId(Integer.valueOf(id));
+		record.setNewsId(oid);
+		record.setMemberType(type);
+		int count = fgNewsFeedBackService.selectCount(record);
+		if (count == 0 && formId != null) {
+			vo.setPass(true);
+		}
+		vo.setPass(false);
+		return vo;
+	}
 }