From 9eba5bba0de43dd802b97b4c84b7d61464a759a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 8 Apr 2022 17:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ctrl/XmTaskExecuserController.java | 42 ++++++++++++++++++- .../core/service/XmTaskExecuserService.java | 3 ++ .../xm/core/dao/XmTaskExecuserMapper.xml | 10 ++++- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 0ecbb44e..77d3ad59 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -105,8 +105,46 @@ public class XmTaskExecuserController { m.put("tips", tips); return m; } - - + + + @ApiOperation( value = "查询xm_task_execuser信息列表",notes="listXmTaskExecuser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") + @ApiImplicitParams({ + @ApiImplicitParam(name="id",value="编号,主键",required=false), + @ApiImplicitParam(name="createTime",value="创建时间",required=false), + @ApiImplicitParam(name="taskId",value="任务id",required=false), + @ApiImplicitParam(name="userid",value="执行人id",required=false), + @ApiImplicitParam(name="startTime",value="加入时间",required=false), + @ApiImplicitParam(name="endTime",value="离开时间",required=false), + @ApiImplicitParam(name="status",value="执行人状态0候选排队中1执行任务中1离开任务",required=false), + @ApiImplicitParam(name="remarks",value="备注",required=false), + @ApiImplicitParam(name="settleAmount",value="结算金额",required=false), + @ApiImplicitParam(name="settleHour",value="结算工时",required=false), + @ApiImplicitParam(name="settleStatus",value="结算状态0未结算1已结算2无需结算",required=false), + @ApiImplicitParam(name="settleTime",value="结算时间",required=false), + @ApiImplicitParam(name="createUserid",value="创建人",required=false), + @ApiImplicitParam(name="createUsername",value="创建人姓名",required=false), + @ApiImplicitParam(name="username",value="执行人姓名",required=false), + @ApiImplicitParam(name="pageSize",value="每页记录数",required=false), + @ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false), + @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false), + @ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false), + @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) + }) + @ApiResponses({ + @ApiResponse(code = 200,response= XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + }) + @RequestMapping(value="/listWithTask",method=RequestMethod.GET) + public Map listXmTaskExecuserWithTask( @RequestParam Map xmTaskExecuser){ + Map m = new HashMap<>(); + RequestUtils.transformArray(xmTaskExecuser, "ids"); + PageUtils.startPage(xmTaskExecuser); + List> xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhereWithTask(xmTaskExecuser); //列出XmTaskExecuser列表 + PageUtils.responePage(m, xmTaskExecuserList); + m.put("data",xmTaskExecuserList); + Tips tips=new Tips("查询成功"); + m.put("tips", tips); + return m; + } @ApiOperation( value = "新增一条xm_task_execuser信息",notes="addXmTaskExecuser,主键如果为空，后台自动生成") @ApiResponses({ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index 759ef1c2..64942ac9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -219,6 +219,9 @@ public class XmTaskExecuserService extends BaseService { this.update("updateXmTaskExeUseridsAndUsernamesByTaskId", taskId); } + public List> selectListMapByWhereWithTask(Map params){ + return super.selectList("selectListMapByWhereWithTask",params); + } } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml index e5839470..5e22eb8c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml @@ -11,7 +11,7 @@ ( #{item.taskId}, #{item.userid}) - + and (res.task_name like concat('%',#{key},'%') or res.username like concat('%',#{key},'%') ) @@ -75,7 +75,13 @@ t.task_state=case when e1.executor_userid is null and t.task_state='1' then '0' when e1.executor_userid is not null and t.task_state='0' then '1' else t.task_state end WHERE t.id = #{taskId} - +