From 2f2aa42d410ed4f0c4681ef0ccfe60f89025072b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Nov 2021 09:28:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=94=E4=BA=A7=E5=93=81=E3=80=81?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=A6=81=E6=B1=82=E5=A4=8D=E6=9F=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E5=9D=87=E8=BF=94=E5=9B=9E=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A4=8D=E6=9F=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8D=87=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcPlacePatrolReviewRecordController.java       | 10 ++++------
 .../service/IcPlacePatrolReviewRecordService.java  |  4 ++--
 .../impl/IcPlacePatrolReviewRecordServiceImpl.java | 14 ++++++++++++--
 .../mapper/IcPlacePatrolReviewRecordDao.xml        |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java
index 5f0f36c750..04666c0230 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java
@@ -52,11 +52,10 @@ public class IcPlacePatrolReviewRecordController {
      * @Description 新增巡查复查记录
      **/
     @PostMapping("add")
-    public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolReviewRecordFormDTO formDTO) {
+    public Result<PlacePatrolReviewRecordDetailResultDTO> add(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolReviewRecordFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AddPlacePatrolReviewRecordFormDTO.Add.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
-        placePatrolReviewRecordService.add(formDTO);
-        return new Result();
+        return new Result<PlacePatrolReviewRecordDetailResultDTO>().ok(placePatrolReviewRecordService.add(formDTO));
     }
 
     /**
@@ -64,10 +63,9 @@ public class IcPlacePatrolReviewRecordController {
      * @Description 修改巡查复查记录
      **/
     @PostMapping("edit")
-    public Result edit(@LoginUser TokenDto tokenDto, @RequestBody EditPlacePatrolReviewRecordFormDTO formDTO) {
+    public Result<PlacePatrolReviewRecordDetailResultDTO> edit(@LoginUser TokenDto tokenDto, @RequestBody EditPlacePatrolReviewRecordFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, EditPlacePatrolReviewRecordFormDTO.Edit.class);
-        placePatrolReviewRecordService.edit(formDTO);
-        return new Result();
+        return new Result<PlacePatrolReviewRecordDetailResultDTO>().ok(placePatrolReviewRecordService.edit(formDTO));
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolReviewRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolReviewRecordService.java
index 2ab44dd930..1bc4b86fe5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolReviewRecordService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolReviewRecordService.java
@@ -37,13 +37,13 @@ public interface IcPlacePatrolReviewRecordService extends BaseService<IcPlacePat
      * @Author sun
      * @Description 新增巡查复查记录
      **/
-    void add(AddPlacePatrolReviewRecordFormDTO formDTO);
+    PlacePatrolReviewRecordDetailResultDTO add(AddPlacePatrolReviewRecordFormDTO formDTO);
 
     /**
      * @Author sun
      * @Description 修改巡查复查记录
      **/
-    void edit(EditPlacePatrolReviewRecordFormDTO formDTO);
+    PlacePatrolReviewRecordDetailResultDTO edit(EditPlacePatrolReviewRecordFormDTO formDTO);
 
     /**
      * @Author sun
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
index 7341c0012a..24eb3ebd2b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
@@ -75,10 +75,12 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void add(AddPlacePatrolReviewRecordFormDTO formDTO) {
+    public PlacePatrolReviewRecordDetailResultDTO add(AddPlacePatrolReviewRecordFormDTO formDTO) {
+        PlacePatrolReviewRecordDetailResultDTO resultDTO = new PlacePatrolReviewRecordDetailResultDTO();
         //1.复查记录表新增数据
         IcPlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolReviewRecordEntity.class);
         insert(entity);
+
         //2.修改巡查记录数据最新巡查时间和结果
         IcPlacePatrolRecordEntity recordEntity = new IcPlacePatrolRecordEntity();
         recordEntity.setId(entity.getPlacePatrolRecordId());
@@ -86,6 +88,9 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         recordEntity.setFinalTime(entity.getReviewTime());
         icPlacePatrolRecordService.updateById(recordEntity);
 
+        //3.返回详情数据
+        resultDTO = detail(entity.getId());
+        return resultDTO;
     }
 
     /**
@@ -94,7 +99,8 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void edit(EditPlacePatrolReviewRecordFormDTO formDTO) {
+    public PlacePatrolReviewRecordDetailResultDTO edit(EditPlacePatrolReviewRecordFormDTO formDTO) {
+        PlacePatrolReviewRecordDetailResultDTO resultDTO = new PlacePatrolReviewRecordDetailResultDTO();
         //1.修改复查记录表数据
         IcPlacePatrolReviewRecordEntity entity = baseDao.selectById(formDTO.getPlacePatrolReviewRecordId());
         if (null == entity) {
@@ -103,6 +109,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolReviewRecordEntity.class);
         entity.setId(formDTO.getPlacePatrolReviewRecordId());
         baseDao.updateById(entity);
+
         //2.复查记录修改了复查时间或复查结果时对应修改巡查记录数据最新巡查时间和结果
         if (StringUtils.isNotEmpty(formDTO.getReviewResult()) || StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
             IcPlacePatrolRecordEntity recordEntity = new IcPlacePatrolRecordEntity();
@@ -116,6 +123,9 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
             icPlacePatrolRecordService.updateById(recordEntity);
         }
 
+        //3.返回复查记录修改后的详情数据
+        resultDTO = detail(formDTO.getPlacePatrolReviewRecordId());
+        return resultDTO;
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml
index 5151dfe91b..8b54d868e9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolReviewRecordDao.xml
@@ -39,7 +39,7 @@
             AND a.id = #{placePatrolReviewRecordId}
         </if>
         ORDER BY
-            a.created_time DESC
+            a.created_time ASC
     </select>
 
 </mapper>
\ No newline at end of file

From 1b5f8787b8cf4a06b42cef43c63c5f973c6e44a0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Nov 2021 10:00:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcPlacePatrolRecordDao.xml    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
index d0c33f3471..58fab01358 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml
@@ -43,6 +43,12 @@
         <if test="ninePlaceVal != null and ninePlaceVal.trim() != ''">
             AND a.nine_place_val = #{ninePlaceVal}
         </if>
+        <if test="firstResult != null and firstResult.trim() != ''">
+            AND a.first_result = #{firstResult}
+        </if>
+        <if test="finalResult != null and finalResult.trim() != ''">
+            AND a.final_result = #{finalResult}
+        </if>
         <if test="placeOrgName != null and placeOrgName.trim() != ''">
             AND a.place_org_id IN (select id from ic_place_org where place_org_name like concat('%', #{placeOrgName}, '%'))
         </if>