diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessAttachmentDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessAttachmentDao.java index 4a84a02c90..59e6462101 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessAttachmentDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessAttachmentDao.java @@ -38,4 +38,6 @@ public interface ScreenProjectProcessAttachmentDao extends BaseDao list); + int deleteByProcessIds(@Param("customerId") String customerId, @Param("list") List list); + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessDao.java index f9638e9c4f..2a92081e0b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectProcessDao.java @@ -41,4 +41,6 @@ public interface ScreenProjectProcessDao extends BaseDao list); + + int deleteByProcessIds(@Param("customerId") String customerId, @Param("list") List list); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java index 863b119c07..a73ec71e5a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dto.screen.form.ScreenProjectProcessFormDTO; import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.entity.evaluationindex.screen.ScreenProjectProcessAttachmentEntity; import com.epmet.entity.evaluationindex.screen.ScreenProjectProcessEntity; +import com.epmet.service.evaluationindex.screen.ScreenProjectProcessAttachmentService; import com.epmet.service.evaluationindex.screen.ScreenProjectProcessService; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -42,9 +43,12 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; /** * 中央区-项目数据项目处理进展表 @@ -58,6 +62,8 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -120,39 +126,35 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl { - //先删除旧数据 - QueryWrapper screenProjectProcessEntityQueryWrapper = new QueryWrapper<>(); - screenProjectProcessEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId()) - .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId()) - .eq(StringUtils.isNotBlank(item.getProcessId()), "process_id", item.getProcessId()); - baseDao.delete(screenProjectProcessEntityQueryWrapper); - - QueryWrapper screenProjectProcessAttachmentEntityQueryWrapper = new QueryWrapper<>(); - screenProjectProcessAttachmentEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId()) - .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId()) - .eq(StringUtils.isNotBlank(item.getProcessId()), "process_id", item.getProcessId()); - screenProjectProcessAttachmentDao.delete(screenProjectProcessAttachmentEntityQueryWrapper); - //插入 - ScreenProjectProcessEntity screenProjectProcessEntity = ConvertUtils.sourceToTarget(item, ScreenProjectProcessEntity.class); - screenProjectProcessEntity.setCustomerId(param.getCustomerId()); - screenProjectProcessEntity.setDataEndTime(param.getDateId()); - baseDao.insert(screenProjectProcessEntity); - - List attachments = item.getAttachments(); - if (!CollectionUtils.isEmpty(attachments)){ - for (int i = 0; i < attachments.size(); i++) { - ScreenProjectProcessAttachmentEntity attachmentEntity = ConvertUtils.sourceToTarget(attachments.get(i), ScreenProjectProcessAttachmentEntity.class); - attachmentEntity.setCustomerId(param.getCustomerId()); - attachmentEntity.setProcessId(item.getProcessId()); - attachmentEntity.setProjectId(item.getProjectId()); - if (attachmentEntity.getSort() == null) { - attachmentEntity.setSort(i); - } - screenProjectProcessAttachmentDao.insert(attachmentEntity); + List processIdList = + param.getDataList().stream().map(ScreenProjectProcessFormDTO :: getProcessId).collect(Collectors.toList()).stream().distinct() + .collect(Collectors.toList()); + //删除旧数据 + baseDao.deleteByProcessIds(param.getCustomerId(), processIdList); + screenProjectProcessAttachmentDao.deleteByProcessIds(param.getCustomerId(), processIdList); + + List attachmentList = new ArrayList<>(); + + List processList = param.getDataList().stream().map(item -> { + ScreenProjectProcessEntity entity = ConvertUtils.sourceToTarget(item, ScreenProjectProcessEntity.class); + entity.setCustomerId(param.getCustomerId()); + entity.setDataEndTime(param.getDateId()); + AtomicInteger i = new AtomicInteger(0); + List attachments = item.getAttachments().stream().map(attachment -> { + ScreenProjectProcessAttachmentEntity attachmentEntity = ConvertUtils.sourceToTarget(attachment, ScreenProjectProcessAttachmentEntity.class); + attachmentEntity.setCustomerId(param.getCustomerId()); + attachmentEntity.setProcessId(item.getProcessId()); + attachmentEntity.setProjectId(item.getProjectId()); + if (attachmentEntity.getSort() == null) { + attachmentEntity.setSort(i.getAndIncrement()); } - } - }); + return attachmentEntity; + }).collect(Collectors.toList()); + attachmentList.addAll(attachments); + return entity; + }).collect(Collectors.toList()); + this.insertBatch(processList); + screenProjectProcessAttachmentService.insertBatch(attachmentList); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessAttachmentDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessAttachmentDao.xml index 953f2bee72..6ca35c0bee 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessAttachmentDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessAttachmentDao.xml @@ -85,4 +85,15 @@ ) + + + delete from screen_project_process_attachment + where customer_id = #{customerId} + + AND + + PROCESS_ID = #{processId} + + + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessDao.xml index fc19f60add..31c2bb1c68 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessDao.xml @@ -22,6 +22,17 @@ where del_flag = '0' and customer_id = #{customerId} + + delete from screen_project_process + where customer_id = #{customerId} + + AND + + PROCESS_ID = #{processId} + + + + INSERT INTO screen_project_process (