소스 검색

修改辅料统计报表

txf 3 년 전
부모
커밋
a6973c0ca6
2개의 변경된 파일2개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 4
      src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java
  2. 1 1
      src/main/resources/bootstrap.yml

+ 1 - 4
src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java

@@ -55,14 +55,11 @@ public class StatisticalReportImpl implements IStatisticalReportService {
      **/
     public List<Map<String, Object>> getRLFLReport(Map<String, Object> map){
         List<Map<String, Object>> mapList = null;
-        if(DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 5){
+        if(DataChange.dataToBigDecimal(map.get("orderTypee")).intValue() == 5){
             mapList = statisticalReportMapper.getFuPurchaseFLRLReport(map);
         }else {
             mapList = statisticalReportMapper.getAllPurchaseFLRLReport(map);
         }
-        for (Map<String, Object> mesMap : mapList) {
-            calculateDifferenceTime(mesMap);
-        }
         return mapList;
     }
 

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8