Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@@ -31,6 +31,7 @@ import com.epmet.opendata.service.BaseConflictsResolveService;
 import com.epmet.opendata.service.BaseDisputeProcessService;
 import com.epmet.opendata.service.ExDeptService;
 import com.epmet.opendata.service.ExUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,7 @@ import java.util.stream.Collectors;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-10-15
  */
+@Slf4j
 @Service
 public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputeProcessDao, BaseDisputeProcessEntity> implements BaseDisputeProcessService {
     @Resource
@@ -90,7 +92,10 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
     }
 
     private void saveEvent(EventInfoFormDTO formDTO, Map<String, Integer> deptMap, Map<String, Integer> userMap, List<EventInfoResultDTO> list) {
-        if (CollectionUtils.isNotEmpty(list)) {
+        if (CollectionUtils.isEmpty(list)) {
+            log.warn("no event data to save table base_conflicts_resolve");
+            return;
+        }
 
         List<BaseConflictsResolveEntity> resolveList = list.stream().map(item -> {
             BaseConflictsResolveEntity entity = new BaseConflictsResolveEntity();
@@ -117,6 +122,10 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
             if (("03").equals(item.getStatus())) {
                 entity.setSuccessfulOrNot("Y");
             }
+            //业务不包含 一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）
+            if ("03".equals(item.getParentEventCategory())) {
+                entity.setNumberInvolved(NumConstant.TWO);
+            }
             entity.setEventNo(("py_").concat(item.getId()));
             entity.setFirstEventCategory(item.getParentEventCategory());
             entity.setSource("01");
@@ -130,4 +139,3 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         baseConflictsResolveService.saveOrUpdateBatch(resolveList, formDTO.getPageSize());
     }
 }
-}