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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java

@@ -62,8 +62,6 @@ public class IpUtils {
 			if (StringUtils.isEmpty(ip) || IP_UNKNOWN.equalsIgnoreCase(ip)) {
 				ip = request.getRemoteAddr();
 			}
-
-			logger.info("getIpAddr origin ip:{}",ip);
 			//对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
 			if (ip != null) { //"***.***.***.***".length() = 15
 				if (ip.indexOf(StrConstant.COMMA) > 0) {
@@ -74,6 +72,7 @@ public class IpUtils {
 		} catch (Exception e) {
 			logger.error("IpUtils getIpAddr ERROR ", e);
 		}
+
 		return ip;
 	}
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -337,7 +337,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         List<ImportCommunitySelfOrganization> list = testExcelImportResult.getList();
         if (CollectionUtils.isNotEmpty(list)){
             String customerId = tokenDto.getCustomerId();
-            List<String> existsNames = baseDao.selectOrgByOrgName(list.stream().map(m -> m.getOrganizationName()).collect(Collectors.toList()), customerId);
+            List<String> existsNames = baseDao.selectOrgByOrgName(list.stream().map(ImportCommunitySelfOrganization::getOrganizationName).collect(Collectors.toList()), customerId);
             Map<String, List<ImportCommunitySelfOrganization>> groupByName = list.stream().collect(Collectors.groupingBy(ImportCommunitySelfOrganization::getOrganizationName));
             groupByName.forEach((k,v) -> {
                 if (v.size() > NumConstant.ONE){

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -40,7 +40,11 @@
             cm.ID AS matterId,
             cm.START_TIME AS startTime,
             cm.END_TIME AS endTime,
-            cm.APPOINTMENT_TYPE AS appointmentType
+            cm.APPOINTMENT_TYPE AS appointmentType,
+            case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
+                 ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime
         FROM ic_party_service_center sc
         LEFT JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = sc.ID AND cm.DEL_FLAG = 0)
         WHERE sc.DEL_FLAG = 0