Merge branch 'dev_bugfix_ljj' into dev_temp

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectQuantityOrgMonthlyDao.xml

@@ -19,7 +19,7 @@
             AND m.ORG_ID =#{agencyId}
             AND m.MONTH_ID <= #{endMonthId}
         ORDER BY
-            m.MONTH_ID ASC
+            m.MONTH_ID DESC
             LIMIT 12
     </select>
-</mapper>
+</mapper>

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<ScreenProject
 
 	void insertBatch(@Param("list")List<ScreenProjectProcessAttachmentDTO> list);
 
+	int deleteByProcessIds(@Param("customerId") String customerId, @Param("list") List<String> list);
+
 }

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<ScreenProjectProcessEnt
     int countByCustomerId(@Param("customerId") String customerId);
 
     void insertBatch(@Param("list") List<ScreenProjectProcessDTO> list);
+
+    int deleteByProcessIds(@Param("customerId") String customerId, @Param("list") List<String> list);
 }

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<ScreenProje
 
     @Resource
     private ScreenProjectProcessAttachmentDao screenProjectProcessAttachmentDao;
+    @Resource
+    private ScreenProjectProcessAttachmentService screenProjectProcessAttachmentService;
     @Override
     public PageData<ScreenProjectProcessDTO> page(Map<String, Object> params) {
         IPage<ScreenProjectProcessEntity> page = baseDao.selectPage(
@@ -120,39 +126,35 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl<ScreenProje
                 affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId());
             }
         }
-        param.getDataList().forEach(item -> {
+        List<String> processIdList =
-            //先删除旧数据
+                param.getDataList().stream().map(ScreenProjectProcessFormDTO :: getProcessId).collect(Collectors.toList()).stream().distinct()
-            QueryWrapper<ScreenProjectProcessEntity> screenProjectProcessEntityQueryWrapper = new QueryWrapper<>();
+                        .collect(Collectors.toList());
-            screenProjectProcessEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
+        //删除旧数据
-                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId())
+        baseDao.deleteByProcessIds(param.getCustomerId(), processIdList);
-                    .eq(StringUtils.isNotBlank(item.getProcessId()), "process_id", item.getProcessId());
+        screenProjectProcessAttachmentDao.deleteByProcessIds(param.getCustomerId(), processIdList);
-            baseDao.delete(screenProjectProcessEntityQueryWrapper);
+
-
+        List<ScreenProjectProcessAttachmentEntity> attachmentList = new ArrayList<>();
-            QueryWrapper<ScreenProjectProcessAttachmentEntity> screenProjectProcessAttachmentEntityQueryWrapper = new QueryWrapper<>();
+
-            screenProjectProcessAttachmentEntityQueryWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())
+        List<ScreenProjectProcessEntity> processList = param.getDataList().stream().map(item -> {
-                    .eq(StringUtils.isNotBlank(param.getCustomerId()), "customer_id", param.getCustomerId())
+            ScreenProjectProcessEntity entity = ConvertUtils.sourceToTarget(item, ScreenProjectProcessEntity.class);
-                    .eq(StringUtils.isNotBlank(item.getProcessId()), "process_id", item.getProcessId());
+            entity.setCustomerId(param.getCustomerId());
-            screenProjectProcessAttachmentDao.delete(screenProjectProcessAttachmentEntityQueryWrapper);
+            entity.setDataEndTime(param.getDateId());
-            //插入
+            AtomicInteger i = new AtomicInteger(0);
-            ScreenProjectProcessEntity screenProjectProcessEntity = ConvertUtils.sourceToTarget(item, ScreenProjectProcessEntity.class);
+            List<ScreenProjectProcessAttachmentEntity> attachments = item.getAttachments().stream().map(attachment -> {
-            screenProjectProcessEntity.setCustomerId(param.getCustomerId());
+                ScreenProjectProcessAttachmentEntity attachmentEntity = ConvertUtils.sourceToTarget(attachment, ScreenProjectProcessAttachmentEntity.class);
-            screenProjectProcessEntity.setDataEndTime(param.getDateId());
+                attachmentEntity.setCustomerId(param.getCustomerId());
-            baseDao.insert(screenProjectProcessEntity);
+                attachmentEntity.setProcessId(item.getProcessId());
-
+                attachmentEntity.setProjectId(item.getProjectId());
-            List<ScreenProjectProcessAttachmentDTO> attachments = item.getAttachments();
+                if (attachmentEntity.getSort() == null) {
-            if (!CollectionUtils.isEmpty(attachments)){
+                    attachmentEntity.setSort(i.getAndIncrement());
-                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);
                 }
-            }
+                return attachmentEntity;
-        });
+            }).collect(Collectors.toList());
+            attachmentList.addAll(attachments);
+            return entity;
+        }).collect(Collectors.toList());
+        this.insertBatch(processList);
+        screenProjectProcessAttachmentService.insertBatch(attachmentList);
 
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -253,38 +253,37 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
 
         List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos = ConvertUtils.sourceToTarget(screenProjectOrgDailyDTOS, ScreenProjectQuantityOrgMonthlyDTO.class);
         List<ProjectOrgMonthlyResultDTO> projectOrg = baseDao.selectQuantityOrgMonthly(agencyInfos, monthId);
-        if (!CollectionUtils.isEmpty(projectOrg)){
+        /*if (!CollectionUtils.isEmpty(projectOrg)){
             projectOrg.forEach(p -> {
                 p.setClosedIncr(p.getClosedIncr());
                 p.setProjectIncr(p.getProjectIncr());
             });
-        }
+        }*/
         List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId);
-        if (!CollectionUtils.isEmpty(projectGrandOrg)){
+        /*if (!CollectionUtils.isEmpty(projectGrandOrg)){
             projectGrandOrg.forEach(p -> {
                 p.setClosedTotal(p.getClosedTotal());
                 p.setProjectTotal(p.getProjectTotal());
                 p.setUnClosedTotal(p.getUnClosedTotal());
             });
-        }
+        }*/
         agencyInfos.forEach(a -> {
             a.setMonthId(monthId);
             if (!CollectionUtils.isEmpty(projectOrg)){
                 projectOrg.forEach(p -> {
                     if (a.getAreaCode().equals(p.getAreaCode())){
-                        a.setClosedIncr(null == p.getClosedIncr() ? NumConstant.ZERO : p.getClosedIncr());
+                        a.setClosedIncr(null == p.getClosedIncr() ? a.getClosedIncr() : a.getClosedIncr() + p.getClosedIncr());
-                        a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
+                        a.setProjectIncr(null == p.getProjectIncr() ? a.getProjectIncr() : a.getProjectIncr() + p.getProjectIncr());
-                        a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
                     }
                 });
             }
             if (!CollectionUtils.isEmpty(projectGrandOrg)){
                 projectGrandOrg.forEach(p -> {
                     if (a.getAreaCode().equals(p.getAreaCode())){
-                        a.setClosedTotal(null == p.getClosedTotal() ? NumConstant.ZERO : p.getClosedTotal());
+                        a.setClosedTotal(null == p.getClosedTotal() ? a.getClosedTotal() : a.getClosedTotal() + p.getClosedTotal());
-                        a.setProjectTotal(null == p.getProjectTotal() ? NumConstant.ZERO : p.getProjectTotal());
+                        a.setProjectTotal(null == p.getProjectTotal() ? a.getProjectTotal() : a.getProjectTotal() + p.getProjectTotal());
-                        a.setUnClosedTotal(null == p.getUnClosedTotal() ? NumConstant.ZERO : p.getUnClosedTotal());
+                        a.setUnClosedTotal(null == p.getUnClosedTotal() ? a.getUnClosedTotal() : a.getUnClosedTotal() + p.getUnClosedTotal());
-                        a.setProjectIncr(null == p.getProjectIncr() ? NumConstant.ZERO : p.getProjectIncr());
+                        a.setProjectIncr(null == p.getProjectIncr() ? a.getProjectIncr() : a.getProjectIncr() + p.getProjectIncr());
                     }
                 });
             }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectProcessAttachmentDao.xml

@@ -85,4 +85,15 @@
             )
         </foreach>
     </insert>
+
+    <delete id="deleteByProcessIds">
+        delete from screen_project_process_attachment
+        where customer_id = #{customerId}
+        <if test="list != null and list.size() > 0">
+            AND
+            <foreach collection="list" item="processId" separator="or" open="(" close=")">
+                PROCESS_ID = #{processId}
+            </foreach>
+        </if>
+    </delete>
 </mapper>

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}
     </select>
 
+    <delete id="deleteByProcessIds">
+        delete from screen_project_process
+        where customer_id = #{customerId}
+        <if test="list != null and list.size() > 0">
+            AND
+            <foreach collection="list" item="processId" separator="or" open="(" close=")">
+                PROCESS_ID = #{processId}
+            </foreach>
+        </if>
+    </delete>
+
     <insert id="insertBatch" parameterType="java.util.List">
         INSERT INTO screen_project_process
         (