From b5837609dcd4417904eaaa5924de46010443affd Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 19:37:45 +0800
Subject: [PATCH] 居住证审核+从业人员优化
---
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
index dc3c475..d07ce9a 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.modules.task.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,6 +12,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
@@ -35,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
/**
* 报事报修任务表 控制器
@@ -56,9 +42,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入taskReportForRepairs")
- public R<TaskReportForRepairsVO> detail(TaskReportForRepairsEntity taskReportForRepairs) {
+ public R detail(TaskReportForRepairsEntity taskReportForRepairs) {
TaskReportForRepairsEntity detail = taskReportForRepairsService.getOne(Condition.getQueryWrapper(taskReportForRepairs));
- return R.data(TaskReportForRepairsWrapper.build().entityVO(detail));
+ return R.data(detail);
}
/**
* 报事报修任务表 分页
@@ -99,6 +85,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
public R update(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ taskReportForRepairs.setConfirmTime(new Date());
return R.status(taskReportForRepairsService.updateById(taskReportForRepairs));
}
@@ -147,8 +134,8 @@
* @return
*/
@GetMapping("/getStatisticsCount")
- public R statisticsCount() {
- return R.data(taskReportForRepairsService.getStatisticsCount());
+ public R statisticsCount(@RequestParam(value = "houseCode",required = false) String houseCode) {
+ return R.data(taskReportForRepairsService.getStatisticsCount(houseCode));
}
/**
@@ -159,8 +146,28 @@
@GetMapping("/getStatistics")
@ApiOperation(value = "w网格员查询报事报修统计" )
public R getStatistics() {
- return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId()));
+ return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId(),""));
}
+ /**
+ * w网格员查询报事报修统计
+ *
+ * @return
+ */
+ @GetMapping("/getReportForStatistics")
+ @ApiOperation(value = "查询报事报修统计" )
+ public R getReportForStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
+ return R.data(taskReportForRepairsService.getReportForStatistics(code, roleType));
+ }
+
+ /**
+ * 更新状态--临时接口
+ * @param gridman
+ * @return
+ */
+ @PostMapping("/updateView")
+ public R updateView(@Valid @RequestBody GridmanEntity gridman) {
+ return R.status(taskReportForRepairsService.updateView(gridman));
+ }
}
--
Gitblit v1.9.3