优化装备财务报表

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/SizeAndTypeDto.java

-package com.junmp.jyzb.api.bean.dto;
-
-import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
-import com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SizeAndTypeDto {
-    private List<SizeDto> sizeList;
-
-    private List<TypeDto> typeList;
-
-    private List<OrgDto> orgList;
-
-}

jyzb-biz/src/main/java/com/junmp/jyzb/entity/SizeAndType.java

@@ -8,4 +8,5 @@ import java.util.List;
 public class SizeAndType {
     private List<EquipmentType> typeList;
     private List<EquipmentSize> sizeList;
+    private List<PubOrg> orgList;
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -529,31 +529,15 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
     @Override
     public String exportSizeAndType(QueryEquipmentTypeReq req) {
         List<EquipmentType> typeList = list(new LambdaQueryWrapper<EquipmentType>().ge(EquipmentType::getUpdateTime, req.getUpdateTime()));
-        SizeAndTypeDto sizeAndType = new SizeAndTypeDto();
-        List<TypeDto> collect = typeList.stream().map(type -> {
-            TypeDto typeDto = new TypeDto();
-            BeanPlusUtil.copyProperties(type, typeDto);
-            return typeDto;
-        }).collect(Collectors.toList());
-
-        sizeAndType.setTypeList(CollectionUtil.isNotEmpty(collect)?collect:new ArrayList<>());
+        SizeAndType sizeAndType = new SizeAndType();
+        sizeAndType.setTypeList(CollectionUtil.isNotEmpty(typeList)?typeList:new ArrayList<>());
         List<EquipmentSize> sizeList = equipmentSizeService.list(new LambdaQueryWrapper<EquipmentSize>().ge(EquipmentSize::getUpdateTime, req.getUpdateTime()));
-        List<SizeDto> collect1 = sizeList.stream().map(size -> {
-            SizeDto sizeDto = new SizeDto();
-            BeanPlusUtil.copyProperties(size, sizeDto);
-            return sizeDto;
-        }).collect(Collectors.toList());
-        sizeAndType.setSizeList(CollectionUtil.isNotEmpty(collect1)?collect1:new ArrayList<>());
+        sizeAndType.setSizeList(CollectionUtil.isNotEmpty(sizeList)?sizeList:new ArrayList<>());
 
         if (req.getFlag()){
             List<PubOrg> pubList = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().ge(PubOrg::getUpdateTime, req.getUpdateTime())
                     .eq(PubOrg::getDelFlag,1));
-            List<OrgDto> collect2 = pubList.stream().map(pubOrg -> {
-                OrgDto orgDto = new OrgDto();
-                BeanPlusUtil.copyProperties(pubOrg, orgDto);
-                return orgDto;
-            }).collect(Collectors.toList());
-            sizeAndType.setOrgList(CollectionUtil.isNotEmpty(collect2)?collect2:new ArrayList<>());
+            sizeAndType.setOrgList(CollectionUtil.isNotEmpty(pubList)?pubList:new ArrayList<>());
         }
 
         String jsonString = JSONObject.toJSONString(sizeAndType);
@@ -616,6 +600,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
     }
 
+
+
 }
 
 

jyzb-biz/src/main/resources/mapper/PriceSumSummaryMapper.xml

@@ -52,7 +52,7 @@
             vie_price_sum_summary vpss
             LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
             WHERE
-            vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )
+            vpss.MONTH = 1
             AND po.del_flag = 1
             AND (po.org_id = #{orgId} OR po.org_parent_ids LIKE CONCAT( '%', #{orgId}, '%' ))
             <if test="typeIdsList!=null and typeIdsList.size() > 0">
@@ -376,7 +376,7 @@
         vie_price_sum_summary vpss
         LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
         WHERE
-        vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )
+        vpss.MONTH = 1
         and `po`.`del_flag` = 1
         <if test="level ==null " >
             and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
@@ -422,7 +422,7 @@
         vie_price_sum_summary vpss
         LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
         WHERE
-        vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )
+        vpss.MONTH = 1
         and `po`.`del_flag` = 1
         <if test="level ==null " >
         and (po.org_id =#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')