From 5ae3c846bdf19798eb227be443fd98fee1c21d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 4 Dec 2022 00:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=95=E6=A0=87=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xm/core/ctrl/XmTaskController.java    | 39 +++++++++++++++++--
 .../mapper/xm/core/dao/XmTaskMapper.xml       |  4 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
index de0ba278..0fe35445 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
@@ -433,13 +433,16 @@ public class XmTaskController {
 		m.put("tips", tips);
 		return m;
 	}
-	@ApiOperation( value = "查询任务的信息详情，免登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiEntityParams(value = XmTask.class,props = {"id","shareKey"}) 
+
+
+
+	@ApiOperation( value = "查询互联网开放的任务的信息详情，免登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+	@ApiEntityParams(value = XmTask.class,props = {"id","shareKey"})
 	@ApiResponses({
 			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/shareTaskDetail",method=RequestMethod.GET)
-	public Map<String,Object> taskDetail( @ApiIgnore @RequestParam Map<String,Object> xmTask){
+	public Map<String,Object> shareTaskDetail( @ApiIgnore @RequestParam Map<String,Object> xmTask){
 		Tips tips=new Tips("查询成功");
 		Map<String,Object> m = new HashMap<>();
 		String id=(String) xmTask.get("id");
@@ -466,6 +469,36 @@ public class XmTaskController {
 			if( ! "1".equals(toTaskCenter)){
 				return ResponseHelper.failed("toTaskCenter-0","未开放互联网访问权限");
 			}
+			XmTaskCalcService.putReadNum((String) taskDb.get("id"),1);
+			m.put("data",taskDb);
+			m.put("tips", tips);
+		}
+		m.put("tips", tips);
+		return m;
+	}
+
+
+	@ApiOperation( value = "查询任务的信息详情，必须登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+	@ApiEntityParams(value = XmTask.class,props = {"id","shareKey"}) 
+	@ApiResponses({
+			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/taskDetail",method=RequestMethod.GET)
+	public Map<String,Object> taskDetail( @ApiIgnore @RequestParam Map<String,Object> xmTask){
+		Tips tips=new Tips("查询成功");
+		Map<String,Object> m = new HashMap<>();
+		String id=(String) xmTask.get("id");
+		if(!StringUtils.hasText(id)){
+			tips.setFailureMsg("任务编号id必传");
+		}
+
+		if(tips.isOk()){
+			Map<String,Object> taskDb= xmTaskService.shareTaskDetail(xmTask);
+			//  检测任务是否可被查询
+			if(taskDb==null|| taskDb.isEmpty()){
+				return ResponseHelper.failed("data-0","数据不存在");
+			}
+			XmTaskCalcService.putReadNum((String) taskDb.get("id"),1);
 			m.put("data",taskDb);
 			m.put("tips", tips);
 		}
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 99806116..2ac5a903 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -11,7 +11,9 @@
                  ( #{item})
              </foreach>
          </if>
-
+		<if test="bidEtimeStart!=null">
+			and res.bid_etime &gt; #{bidEtimeStart}
+		</if>
 		<if test=" lvls != null">  and (res.lvl) in
 			<foreach collection="lvls" item="item" index="index" open="(" separator="," close=")" >
 				( #{item})