Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -470,6 +470,9 @@
             <if test="'grid' == orgType">
                 AND GRID_ID = #{orgId}
             </if>
+            <if test="'agency' == orgType">
+                AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%')
+            </if>
             <if test="null != startDate and '' != startDate">
                 AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>
@@ -492,6 +495,9 @@
             <if test="'grid' == orgType">
                 AND GRID_ID = #{orgId}
             </if>
+            <if test="'agency' == orgType">
+                AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%')
+            </if>
             <if test="null != startDate and '' != startDate">
                 AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") <![CDATA[ >= ]]> #{startDate}
             </if>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -386,7 +386,6 @@ public class DataReportingServiceImpl implements DataReportingService {
 			case ProjectConstant.PENDING:
 				return "01";
 			case ProjectConstant.CLOSED:
-				return "02";
 			case ProjectConstant.CLOSED_CASE:
 				return "03";
 			default:

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java

@@ -91,10 +91,15 @@ public class EventreportPingyinEntity {
 	private String waysOfResolving;
 
     /**
-     * 是否办结，填写Y、N（Y 是  N 否）
+     * 必填 是否化解，填写Y、N（Y 是  N 否）
      */
 	private String successfulOrNo;
 
+	/**
+	 * 必填 是否办结，填写Y、N（Y 是  N 否）
+	 */
+	private String successfulDefuse;
+
     /**
      * 办结层级，符合《标准》10.21
      */

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

@@ -70,7 +70,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
         //分批次循环
         while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()) {
             formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
-            result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
+            result = dataStatisticalOpenFeignClient.getEventInfoV2(formDTO);
             list = result.getData();
             saveEvent(list, formDTO.getInitFlag());
         }
@@ -125,11 +125,13 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             eventDescription = StrUtil.filterEmoji(eventDescription);
             entity.setEventDescription(eventDescription);
             entity.setWaysOfResolving(item.getWaysOfResolving());
-            //业务不确定
+            //业务不确定  办结状态和化解状态同步修改
             if (("03").equals(item.getStatus())) {
                 entity.setSuccessfulOrNo("Y");
+                entity.setSuccessfulDefuse("Y");
             } else {
                 entity.setSuccessfulOrNo("N");
+                entity.setSuccessfulDefuse("N");
             }
             entity.setCompleteLevel(item.getCompleteLevel());
             entity.setCompleteTime(item.getCompleteTime());

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

@@ -64,14 +64,13 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
         do {
             Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkListV2(midPatrolFormDTO);
             if (record == null || !record.success()) {
-                log.error("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
+                log.warn("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
                 throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());
             }
             data = record.getData();
             if (CollectionUtils.isEmpty(data)) {
                 //数据已被删除了
-                //暂时设置error 用于排错
+                log.warn("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
-                log.error("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
                 int effectRow = baseDao.deleteById(patrolRecordForm.getId());
                 log.warn("del effectRow:{}", effectRow);
                 throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -536,6 +536,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         String errorMsg = "党员信息所属支部不能为空";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
+                } else if (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty())) {
+                    if (formMap.containsKey("ic_party_member")) {
+                        for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
+                            if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
+                                String errorMsg = "党员信息所属支部不能为空";
+                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                            }
+                        }
+                    }
                 }
                 if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))
                         || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {