Merge remote-tracking branch 'origin/lingshan_master' into dev

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java

@@ -21,6 +21,11 @@ public class IcEventReplyFormDTO implements Serializable {
     public interface Process extends CustomerClientShowGroup {
     }
 
+
+    /**
+     * 回复ID
+     */
+    private String id;
     /**
      * 事件ID
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -622,4 +622,11 @@ public class IcEventController {
         return new Result<List<GridOrVillageEventRateResultDTO>>().ok(icEventService.getEventRateByAgencyId(agencyId));
     }
 
+
+    @PostMapping("updateReply")
+    public Result updateReply(@RequestBody IcEventReplyFormDTO formDTO) {
+        icEventReplyService.updateByReplyId(formDTO);
+        return new Result();
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventReplyService.java

@@ -3,6 +3,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcEventReplyDTO;
+import com.epmet.dto.form.IcEventReplyFormDTO;
 import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventReplyEntity;
 
@@ -87,4 +88,10 @@ public interface IcEventReplyService extends BaseService<IcEventReplyEntity> {
      * @return
      */
     List<IcEventReplyDTO> replyList(String icEventId,String userId);
+
+    /**
+     * 更新事件回复
+     * @param formDTO
+     */
+    void updateByReplyId(IcEventReplyFormDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventReplyServiceImpl.java

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcEventReplyDao;
 import com.epmet.dto.IcEventReplyDTO;
+import com.epmet.dto.form.IcEventReplyFormDTO;
 import com.epmet.dto.result.IcEventProcessListResultDTO;
 import com.epmet.entity.IcEventReplyEntity;
 import com.epmet.service.IcEventReplyService;
@@ -99,4 +100,16 @@ public class IcEventReplyServiceImpl extends BaseServiceImpl<IcEventReplyDao, Ic
         return list;
     }
 
+    @Override
+    public void updateByReplyId(IcEventReplyFormDTO formDTO) {
+        if (null != formDTO.getId()) {
+            IcEventReplyEntity entity = baseDao.selectById(formDTO.getId());
+            entity.setManageStatus(formDTO.getManageStatus());
+            entity.setManageResi(formDTO.getManageResi());
+            entity.setManageResiTel(formDTO.getManageResiTel());
+            entity.setManageTime(formDTO.getManageTime());
+            baseDao.updateById(entity);
+        }
+    }
+
 }