Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -67,9 +67,9 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -78,7 +78,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
 import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
@@ -310,9 +309,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             vehicleInformation.setRegDate(new Date());
             vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
             vehicleInformation.setGasNum(equipmentLists.size());
-            vehicleInformation.setVolume(String.valueOf(equipmentLists.stream()
-                    .mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume"))))
-                    .sum()));
+            BigDecimal totalVolume = equipmentLists.stream()
+                    .map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            vehicleInformation.setVolume(totalVolume.toPlainString());
             vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + "");
 
             boolean hasId = StringUtils.isEmpty(vehicleInfoDto.getSequenceNbr());
@@ -1809,10 +1809,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         vehicleInformation.setRegDate(new Date());
         vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
         vehicleInformation.setGasNum(equipmentLists.size());
-        vehicleInformation.setVolume(String.valueOf(equipmentLists.stream()
-                .mapToDouble(x -> Double.parseDouble(String.valueOf(x.get("singleBottleVolume"))))
-                .sum()));
-        vehicleInformation.setFillingMedium(equipmentLists.get(0).get("chargingMedium") + "");
+        BigDecimal totalVolume = equipmentLists.stream()
+                .map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        vehicleInformation.setVolume(totalVolume.toPlainString());
         vehicleInformation.setAuditPassDate(new Date());
 
         // 登记证记录表主键

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationEquipMapper.xml

@@ -65,6 +65,7 @@
                         INNER JOIN tz_jyjc_inspection_application_equip ae ON A.sequence_nbr = ae.application_seq
                 WHERE
                     A.status = '6616'
+                    AND A.inspection_type = 'DQJY'
                   AND ae.equ_category = '2300'
                   AND pc.company_code = #{dpFilterParamDto.cityCode}
                   AND ( A.application_date BETWEEN #{ dpFilterParamDto.beginDate } AND #{ dpFilterParamDto.endDate } )

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -12,8 +12,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderAreaDataMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderInfoMapper;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
@@ -115,6 +113,7 @@ public class CylinderDPStatisticsServiceImpl {
         if(keys.size()  > 0){
             useCodeEntryMap = getStringTzBaseEnterpriseInfoDtoMap(keys);
         }
+        dataList = dataList.stream().limit(10).collect(Collectors.toList());
         for (Map<String, Object> item : dataList) {
             Object key = item.get("key");
             if (useCodeEntryMap.containsKey(key)) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -202,7 +202,7 @@ public class ZLDPStatisticsServiceImpl {
         shejiNullMap.put("name","无设备类型");
         shejiNullMap.put("value",dataMap.getOrDefault("设计单位null",0));
         shejiCompanyList.add(shejiNullMap);
-        shejiMap.put("data",angaiweiCompanyList);
+        shejiMap.put("data",shejiCompanyList);
 
         //制造Map
         Map<String,Object> zhizaoMap = new HashMap<>();