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 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().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 edit(@LoginUser TokenDto tokenDto, @RequestBody EditPlacePatrolReviewRecordFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, EditPlacePatrolReviewRecordFormDTO.Edit.class); - placePatrolReviewRecordService.edit(formDTO); - return new Result(); + return new Result().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 AND a.nine_place_val = #{ninePlaceVal} + + AND a.first_result = #{firstResult} + + + AND a.final_result = #{finalResult} + AND a.place_org_id IN (select id from ic_place_org where place_org_name like concat('%', #{placeOrgName}, '%')) 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} ORDER BY - a.created_time DESC + a.created_time ASC \ No newline at end of file