九小场所巡查-巡查监管增加修改

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddPlacePatrolRecordFormDTO.java

@@ -122,6 +122,9 @@ public class AddPlacePatrolRecordFormDTO implements Serializable {
     //token中userId
     private String staffId;
 
-    public interface Add {}
+    @NotBlank(message = "placePatrolRecordId不能为空", groups = {Update.class})
+    private String placePatrolRecordId;
 
+    public interface Add {}
+    public interface Update {}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java

@@ -60,6 +60,19 @@ public class IcPlacePatrolRecordController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 新增场所巡查记录
+     **/
+    @PostMapping("update")
+    public Result update(@LoginUser TokenDto tokenDto, @RequestBody AddPlacePatrolRecordFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddPlacePatrolRecordFormDTO.Add.class,AddPlacePatrolRecordFormDTO.Update.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        placePatrolRecordService.update(formDTO);
+        return new Result();
+    }
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java

@@ -38,6 +38,8 @@ public interface IcPlacePatrolRecordService extends BaseService<IcPlacePatrolRec
      **/
     void add(AddPlacePatrolRecordFormDTO formDTO);
 
+    void update(AddPlacePatrolRecordFormDTO formDTO);
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -28,24 +27,17 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPlacePatrolRecordDao;
 import com.epmet.dao.IcPlacePatrolTeamStaffDao;
-import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
 import com.epmet.dto.form.AddPlacePatrolRecordFormDTO;
 import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO;
-import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO;
-import com.epmet.dto.result.*;
-import com.epmet.entity.IcHouseEntity;
+import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO;
+import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO;
 import com.epmet.entity.IcPlacePatrolRecordEntity;
-import com.epmet.entity.IcPlacePatrolTeamEntity;
-import com.epmet.entity.IcPlacePatrolTeamStaffEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.service.IcPlacePatrolRecordService;
 import com.epmet.service.IcPlacePatrolReviewRecordService;
-import com.epmet.service.IcPlacePatrolTeamService;
-import com.epmet.service.IcPlacePatrolTeamStaffService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +82,23 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
         insert(entity);
     }
 
+    /**
+     * @Author sun
+     * @Description 修改场所巡查记录
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AddPlacePatrolRecordFormDTO formDTO) {
+        IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolRecordEntity.class);
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        entity.setAgencyId(staffInfoCache.getAgencyId());
+        entity.setPids(staffInfoCache.getAgencyPIds());
+        entity.setFinalResult(entity.getFirstResult());
+        entity.setFinalTime(entity.getFirstTime());
+        entity.setId(formDTO.getPlacePatrolRecordId());
+        updateById(entity);
+    }
+
     /**
      * @Author sun
      * @Description 删除场所巡查记录