投资效益系统-项目添加车辆信息参数调整

src/main/java/org/springblade/modules/investment/mapper/IbaProjectVolumeMapper.xml

@@ -18,7 +18,9 @@
     </resultMap>
     <resultMap id="groupYear" type="org.springblade.modules.investment.pojo.dto.IbaProjectVolumeDTO">
         <result column="year" property="year"/>
-        <collection property="ibaProjectVolumeList" javaType="java.util.List" resultMap="BaseResultMap"/>
+        <collection property="numbers" ofType="java.lang.Integer" javaType="java.util.List" >
+            <result column="month"/>
+        </collection>
     </resultMap>
 
 
@@ -34,7 +36,7 @@
     </update>
     <select id="selectGroupYearList"
             resultMap="groupYear">
-        select <include refid="Base_Column_List"/> from iba_project_volume where project_id = #{id}
+        select `year`,`month` from iba_project_volume where project_id = #{id}
         group by year, month
         order by year, month
     </select>

src/main/java/org/springblade/modules/investment/pojo/dto/IbaProjectVolumeDTO.java

@@ -15,8 +15,9 @@ public class IbaProjectVolumeDTO {
      * 年份
      */
     private String year;
+
     /**
-     * 对应的月份及车流量
+     * 月份对应的数据
      */
-    private List<IbaProjectVolume> ibaProjectVolumeList;
+    private List<Integer> numbers;
 }

src/main/java/org/springblade/modules/investment/service/impl/IbaProjectServiceImpl.java

@@ -89,16 +89,24 @@ public class IbaProjectServiceImpl extends ServiceImpl<IbaProjectMapper, IbaProj
         //添加车流量信息
         if (!CollectionUtils.isEmpty(ibaProject.getList())) {
             List<IbaProjectVolume> ibaProjectVolumes = new ArrayList<>();
+
+
             for (IbaProjectVolumeDTO ibaProjectVolumeDTO : ibaProject.getList()) {
+
                 String year = ibaProjectVolumeDTO.getYear();
-                for (IbaProjectVolume ibaProjectVolume : ibaProjectVolumeDTO.getIbaProjectVolumeList()) {
+                List<Integer> numbers = ibaProjectVolumeDTO.getNumbers();
+
+                for (int i = 0; i < numbers.size(); i++) {
+                    IbaProjectVolume ibaProjectVolume = new IbaProjectVolume();
                     ibaProjectVolume.setId(SnowFlakeUtil.getId());
                     ibaProjectVolume.setProjectId(ibaProject.getId());
                     ibaProjectVolume.setYear(year);
-
+                    ibaProjectVolume.setMonth(i + 1);
+                    ibaProjectVolume.setNumber(numbers.get(i));
+                    ibaProjectVolumes.add(ibaProjectVolume);
                 }
-                ibaProjectVolumes.addAll(ibaProjectVolumeDTO.getIbaProjectVolumeList());
             }
+
             //批量新增
             projectVolumeService.saveBatch(ibaProjectVolumes);
         }
@@ -123,18 +131,27 @@ public class IbaProjectServiceImpl extends ServiceImpl<IbaProjectMapper, IbaProj
         //删除资金信息
         projectFundMapper.delete(new QueryWrapper<IbaProjectFund>().lambda().eq(IbaProjectFund::getProjectId, ibaProject.getId()));
         //添加新数据
+        //添加车流量信息
         if (!CollectionUtils.isEmpty(ibaProject.getList())) {
             List<IbaProjectVolume> ibaProjectVolumes = new ArrayList<>();
+
+
             for (IbaProjectVolumeDTO ibaProjectVolumeDTO : ibaProject.getList()) {
+
                 String year = ibaProjectVolumeDTO.getYear();
-                for (IbaProjectVolume ibaProjectVolume : ibaProjectVolumeDTO.getIbaProjectVolumeList()) {
+                List<Integer> numbers = ibaProjectVolumeDTO.getNumbers();
+
+                for (int i = 0; i < numbers.size(); i++) {
+                    IbaProjectVolume ibaProjectVolume = new IbaProjectVolume();
                     ibaProjectVolume.setId(SnowFlakeUtil.getId());
                     ibaProjectVolume.setProjectId(ibaProject.getId());
                     ibaProjectVolume.setYear(year);
-
+                    ibaProjectVolume.setMonth(i + 1);
+                    ibaProjectVolume.setNumber(numbers.get(i));
+                    ibaProjectVolumes.add(ibaProjectVolume);
                 }
-                ibaProjectVolumes.addAll(ibaProjectVolumeDTO.getIbaProjectVolumeList());
             }
+
             //批量新增
             projectVolumeService.saveBatch(ibaProjectVolumes);
         }
@@ -191,7 +208,7 @@ public class IbaProjectServiceImpl extends ServiceImpl<IbaProjectMapper, IbaProj
         if (query.getType() == null || (query.getType() != 1 && query.getType() != 2)) {
             query.setType(1);
         }
-        if(query.getSize() == null){
+        if (query.getSize() == null) {
             query.setSize(5);
         }
         return baseMapper.incomeTotalList(query);
@@ -206,7 +223,7 @@ public class IbaProjectServiceImpl extends ServiceImpl<IbaProjectMapper, IbaProj
     @Override
     public List<IbaProject> selectProjectOrCompanyList(Integer type) {
         QueryWrapper<IbaProject> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().select(IbaProject::getId, IbaProject::getProjectName,IbaProject::getOperationCompany)
+        queryWrapper.lambda().select(IbaProject::getId, IbaProject::getProjectName, IbaProject::getOperationCompany)
                 .eq(IbaProject::getIsDeleted, 0)
                 .groupBy(type == 1 ? IbaProject::getId : IbaProject::getOperationCompany);
         return baseMapper.selectList(queryWrapper);