修改检修任务导出

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessStatisticsController.java

@@ -80,13 +80,13 @@ public class OperAccessStatisticsController extends BladeController {
 	 * 分页
 	 */
 	@ApiLog
-	@PostMapping("/list")
+	@GetMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@ApiOperation(value = "分页 查询参数:pid,taskId,manager")
 	@OperationAnnotation(moduleName = "检修管理",title = "检修记录",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询检修记录列表")
-	public R<IPage<OperAccessStatisticsVO>> list(@RequestBody OperAccessStatisticsDTO req, Query query) {
+	public R<IPage<OperAccessStatisticsVO>> list(OperAccessStatisticsDTO req, Query query) {
 		return service.list(req, Condition.getPage(query));
 	}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java

@@ -91,13 +91,16 @@ public class OperAccessTaskController extends BladeController {
 	 * 分页
 	 */
 	@ApiLog
-	@GetMapping("/list")
+	@PostMapping("/list")
 	@ApiOperationSupport(order = 50)
 	@OperationAnnotation(moduleName = "检修管理",title = "我的检修任务",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
 			action = "分页查询我的检修任务列表")
 	@ApiOperation(value = "分页 查询参数:name,code,handler,status,planId,planCode")
-	public R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query) {
+	public R<IPage<OperAccessTaskVO>> list(@RequestBody OperAccessTaskDTO req) {
+		Query query=new Query();
+		query.setCurrent(req.getCurrent());
+		query.setSize(req.getSize());
 		return service.list(req, query);
 	}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/dto/OperAccessTaskDTO.java

@@ -21,7 +21,8 @@ public class OperAccessTaskDTO extends OperAccessTaskEntity {
 
 	@ApiModelProperty(value = "创建机构集合")
 	private List<Long> deptIds;
-
+	@ApiModelProperty(value = "ids")
+	private List<Long> ids;
 	@ApiModelProperty(value = "工作流Key")
 	private String procDefId;
 
@@ -39,4 +40,8 @@ public class OperAccessTaskDTO extends OperAccessTaskEntity {
 
 	@ApiModelProperty("结束时间")
 	private String endTime;
+	@ApiModelProperty("当前页")
+	private Integer current;
+	@ApiModelProperty("每页的数量")
+	private Integer size;
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessStatisticsMapper.xml

@@ -28,12 +28,6 @@
         JOIN hzims_oper_access_task OT
         ON OS.`TASK_ID` = OT.`ID`
         WHERE OS.IS_DELETED = 0
-        <if test="dto.ids != null">
-            and OS.id in
-            <foreach collection="dto.ids" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
         <if test="dto.taskName != null">
             and OT.`NAME` like concat('%',#{dto.taskName},'%')
         </if>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml

@@ -65,6 +65,12 @@
             <if test="req.code != null and req.code != ''">
                 AND t.`CODE` LIKE CONCAT('%',#{req.code},'%')
             </if>
+            <if test="req.ids != null">
+                AND t.id in
+              <foreach collection="req.ids" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+              </foreach>
+            </if>
             <if test="req.handler != null">
                 AND t.`HANDLER`=#{req.handler}
             </if>