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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -35,6 +35,7 @@ import com.epmet.service.project.ProjectService;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.util.DimIdGenerator;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -480,7 +481,9 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		});
 		if (!CollectionUtils.isEmpty(formattingData)) {
 			factOriginProjectOrgPeriodDailyDao.deleteByProjectIds(null, param.getCustomerId());
-				factOriginProjectOrgPeriodDailyDao.insertBatch(formattingData);
+			Lists.partition(formattingData, NumConstant.ONE_HUNDRED)
+					.forEach(part -> factOriginProjectOrgPeriodDailyDao.insertBatch(part));
+
 		}
 	}
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -47,9 +47,9 @@
         </if>
         )t
         LEFT JOIN resi_event_attachment rea
-        ON (rea.RESI_EVENT_ID = t.eventId)
-        where  rea.DEL_FLAG = '0'
-        AND rea.ATTACHMENT_TYPE = 'image'
+        ON (rea.RESI_EVENT_ID = t.eventId
+        and rea.DEL_FLAG = '0'
+        AND rea.ATTACHMENT_TYPE = 'image')
         <if test='eventType == "undisposed" '>
             ORDER BY t.eventTime,rea.sort asc
         </if>