From 68fd2f086d80dd766dd3f84b7a92a2683547fb00 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 02 十一月 2022 15:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
index 7a1bd55..11ca823 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;
import cn.hutool.core.date.DateUtil;
+import com.panzhihua.applets.model.dtos.IDTO;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
@@ -31,6 +32,7 @@
@ApiOperation("小程序列表接口")
@PostMapping("/queryAll")
public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setUserId(this.getUserId());
return this.propertyService.comPropertyRepairSelectAll(commonPage);
}
@@ -44,6 +46,7 @@
public R insert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
comPropertyRepairVO.setCreateTime(DateUtil.date());
comPropertyRepairVO.setCreateBy(this.getUserId());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl);
return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO);
}
@@ -59,9 +62,11 @@
if(comPropertyRepairVO!=null&& StringUtils.isNotEmpty(comPropertyRepairVO.getFeedbackContent())){
comPropertyRepairVO.setFeedbackBy(this.getUserId());
comPropertyRepairVO.setFeedbackTime(DateUtil.date());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dpj);
}
if(comPropertyRepairVO!=null&&StringUtils.isNotEmpty(comPropertyRepairVO.getReplyContent())){
comPropertyRepairVO.setReplyTime(DateUtil.date());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.yjs);
}
return this.propertyService.comPropertyRepairUpdate(comPropertyRepairVO);
}
@@ -73,9 +78,33 @@
* @return 单条数据
*/
@ApiOperation("详情接口")
+ @PostMapping("/detail")
+ public R selectDetail(@RequestBody IDTO idto) {
+ return this.propertyService.comPropertyRepairSelectOne(idto.getId());
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情接口")
@GetMapping("/{id}")
- public R selectOne(@PathVariable("id") Integer id) {
+ public R selectOne(@PathVariable("id") Long id) {
return this.propertyService.comPropertyRepairSelectOne(id);
}
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除接口")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.propertyService.comPropertyRepairDelete(id);
+ }
+
}
--
Gitblit v1.7.1