|
@@ -35,7 +35,7 @@ import java.util.Map;
|
|
|
/**
|
|
|
* @author bieao
|
|
|
* @date 2019/12/31
|
|
|
- * @description app端控制层(项目、电梯、维保、大修)
|
|
|
+ * @description app端控制层(项目 、 电梯 、 维保 、 大修)
|
|
|
*/
|
|
|
@RestController
|
|
|
@RequestMapping("app")
|
|
@@ -118,7 +118,7 @@ public class ProjectAppController {
|
|
|
*/
|
|
|
@PostMapping("record/modify")
|
|
|
@Validation(fields = {"id"})
|
|
|
- public RestResponse modify(@Val @RequestBody MaintenanceRecord record){
|
|
|
+ public RestResponse modify(@Val @RequestBody MaintenanceRecord record) {
|
|
|
boolean result = maintenanceRecordService.modify(record);
|
|
|
if (result) {
|
|
|
return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
|
|
@@ -135,7 +135,7 @@ public class ProjectAppController {
|
|
|
*/
|
|
|
@PostMapping("record/detail")
|
|
|
@Validation(fields = {"id"})
|
|
|
- public RestResponse detail(@Val @RequestBody MaintenanceRecordRequest request){
|
|
|
+ public RestResponse detail(@Val @RequestBody MaintenanceRecordRequest request) {
|
|
|
MaintenanceRecord record = maintenanceRecordService.detail(request.getId());
|
|
|
if (ObjectUtil.isEmpty(record)) {
|
|
|
return RestResponse.success();
|
|
@@ -182,7 +182,7 @@ public class ProjectAppController {
|
|
|
* @date 2020/1/6 11:29 上午
|
|
|
*/
|
|
|
@PostMapping("maintenance/planTask")
|
|
|
- @Validation(fields = {"mtCompanyId", "workerId", "status"})
|
|
|
+ @Validation(fields = {"mtCompanyId", "workerId", "status", "currentTime"})
|
|
|
public RestResponse planTask(@Val @RequestBody MaintenanceRecordRequest request) {
|
|
|
Map<String, Object> result = projectAppService.planTask(request);
|
|
|
return RestResponse.success(result, MessageUtils.get("msg.query.success"));
|
|
@@ -195,7 +195,7 @@ public class ProjectAppController {
|
|
|
* @date 2020/4/24 5:03 下午
|
|
|
*/
|
|
|
@PostMapping("maintenance/recordTask")
|
|
|
- @Validation(fields = {"mtCompanyId", "workerId", "status"})
|
|
|
+ @Validation(fields = {"mtCompanyId", "workerId", "status", "currentTime"})
|
|
|
public RestResponse recordTask(@Val @RequestBody MaintenanceRecordRequest request) {
|
|
|
Map<String, Object> result = projectAppService.recordTask(request);
|
|
|
return RestResponse.success(result, MessageUtils.get("msg.query.success"));
|
|
@@ -225,8 +225,8 @@ public class ProjectAppController {
|
|
|
*/
|
|
|
@PostMapping("capital/sign/in")
|
|
|
@Validation(fields = {"mtCompanyId", "projectId", "userId", "coordinate", "address"})
|
|
|
- public RestResponse signIn(@Val @RequestBody CapitalRepairRequest request){
|
|
|
- return signInService.signIn(request);
|
|
|
+ public RestResponse signIn(@Val @RequestBody CapitalRepairRequest request) {
|
|
|
+ return signInService.signIn(request);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -286,12 +286,12 @@ public class ProjectAppController {
|
|
|
return RestResponse.success(list, MessageUtils.get("msg.query.success"));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * @param request 公司id
|
|
|
- * @return RestResponse 项目列表
|
|
|
- * @description 根据公司id查询公司下大修项目列表
|
|
|
- * @date 2020/4/20 8:18 下午
|
|
|
- */
|
|
|
+ /**
|
|
|
+ * @param request 公司id
|
|
|
+ * @return RestResponse 项目列表
|
|
|
+ * @description 根据公司id查询公司下大修项目列表
|
|
|
+ * @date 2020/4/20 8:18 下午
|
|
|
+ */
|
|
|
@PostMapping("capital/project/list")
|
|
|
@Validation(fields = {"mtCompanyId", "userId", "projectStatus"})
|
|
|
public RestResponse capitalProjectList(@Val @RequestBody CapitalRepairRequest request) {
|