Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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

@@ -17,28 +17,20 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcPlacePatrolReviewRecordDao;
 import com.epmet.dao.IcPlacePatrolTeamStaffDao;
 import com.epmet.dto.IcPlacePatrolTeamStaffDTO;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO;
+import com.epmet.dto.form.AddPlacePatrolReviewRecordFormDTO;
+import com.epmet.dto.form.EditPlacePatrolReviewRecordFormDTO;
+import com.epmet.dto.form.GetListPlacePatrolReviewRecordFormDTO;
 import com.epmet.dto.result.GetListPlacePatrolReviewRecordResultDTO;
-import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO;
 import com.epmet.dto.result.PlacePatrolReviewRecordDetailResultDTO;
 import com.epmet.entity.IcPlacePatrolRecordEntity;
 import com.epmet.entity.IcPlacePatrolReviewRecordEntity;
-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.github.pagehelper.PageHelper;
@@ -50,7 +42,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -111,13 +102,13 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
         baseDao.updateById(entity);
 
         //2.复查记录修改了复查时间或复查结果时对应修改巡查记录数据最新巡查时间和结果
-        if (StringUtils.isNotEmpty(formDTO.getReviewResult()) || StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(formDTO.getReviewResult()) || com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
             IcPlacePatrolRecordEntity recordEntity = new IcPlacePatrolRecordEntity();
             recordEntity.setId(entity.getPlacePatrolRecordId());
-            if (StringUtils.isNotEmpty(formDTO.getReviewResult()) || StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
+            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(formDTO.getReviewResult()) || com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
                 recordEntity.setFinalResult(entity.getReviewResult());
             }
-            if (StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
+            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(formDTO.getReviewTime().toString())) {
                 recordEntity.setFinalTime(entity.getReviewTime());
             }
             icPlacePatrolRecordService.updateById(recordEntity);