Parcourir la source

后管-同步
1、查询接口调整

LHB il y a 2 semaines
Parent
commit
a9f3db1919

+ 9 - 15
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeSynchronousRecordController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.beanutils.BeanUtils;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.dto.WbsTreeSynchronousRecordDTO;
 import org.springblade.manager.entity.WbsTreeSynchronousRecord;
@@ -166,28 +167,21 @@ public class WbsTreeSynchronousRecordController {
                 .eq(WbsTreeSynchronousRecord::getProjectId, projectId)
                 .ne(WbsTreeSynchronousRecord::getStatus, 2)
         );
-        List<WbsTreeSynchronousRecordDTO> collect = list.stream().map(m -> {
-            WbsTreeSynchronousRecordDTO wbsTreeSynchronousRecordDTO = new WbsTreeSynchronousRecordDTO();
-            try {
-                BeanUtils.copyProperties(m, wbsTreeSynchronousRecordDTO); // 复制属性
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                throw new RuntimeException(e);
-            }
+        List<WbsTreeSynchronousRecordDTO> wbsTreeSynchronousRecordDTOS = BeanUtil.copyProperties(list, WbsTreeSynchronousRecordDTO.class);
+        wbsTreeSynchronousRecordDTOS.forEach(m -> {
             if(m.getNodeNum() != 0){
-                wbsTreeSynchronousRecordDTO.setSurplusCount(m.getNodeNum() - m.getNodeNumEnd());
+                m.setSurplusCount(m.getNodeNum() - m.getNodeNumEnd());
                 int i = m.getNodeNumEnd() * 100 / m.getNodeNum();
                 if (m.getStatus() == 2 || i > 100) {
                     i = 100;
                 }
-                wbsTreeSynchronousRecordDTO.setProgress(i);
+                m.setProgress(i);
             }else{
-                wbsTreeSynchronousRecordDTO.setSurplusCount(0);
-                wbsTreeSynchronousRecordDTO.setProgress(0);
+                m.setSurplusCount(0);
+                m.setProgress(0);
             }
-
-            return wbsTreeSynchronousRecordDTO;
-        }).collect(Collectors.toList());
-        return R.data(collect);
+        });
+        return R.data(wbsTreeSynchronousRecordDTOS);
     }
 }