Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -74,7 +74,7 @@
                 AND ur.reg_type IN (0, 2)
                 )
             </if>
-            ORDER BY tjurm.rec_date DESC
+            ORDER BY tjurm.create_date DESC
         </where>
     </select>
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
@@ -161,7 +161,7 @@
             <if test="sort != null">
                 tjurm.${sort.field} ${sort.sortType},
             </if>
-            tjurm.rec_date DESC
+            tjurm.create_date DESC
         </where>
     </select>
     <select id="queryForPageForJG" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
@@ -238,7 +238,7 @@
             <if test="sort != null">
                 tjurm.${sort.field} ${sort.sortType},
             </if>
-            tjurm.rec_date DESC
+            tjurm.create_date DESC
         </where>
     </select>
 
@@ -358,7 +358,7 @@
             <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
                 and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
             </if>
-            ORDER BY tjurm.rec_date DESC
+            ORDER BY tjurm.create_date DESC
         </where>
     </select>
 
@@ -374,7 +374,7 @@
             </if>
         </where>
         ORDER BY
-        tjurm.rec_date DESC
+        tjurm.create_date DESC
     </select>
 
     <select id="initUseRegistrationCodeIntoRedis" resultType="java.util.Map">

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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -61,10 +61,12 @@ 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 java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
 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;
 
@@ -801,7 +803,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return map;
     }
 
-    private Map<String, Object> getFillingMediumMap() {
+    public Map<String, Object> getFillingMediumMap() {
         if (fillingMediumMap == null) {
             synchronized (this) {
                 if (fillingMediumMap == null) {

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/ShCarServiceImpl.java

@@ -228,6 +228,7 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
         List<Map<String, Object>> equList = changeVehicleRegistrationUnitService.getBaseMapper().getEquList(records)
                 .stream()
                 .peek(x -> x.put("carNumber", completeDataSanHuanMap.get("carNumber")))
+                .peek(x -> x.put("chargingMedium", changeVehicleRegistrationUnitService.getFillingMediumMap().get(x.get("chargingMedium"))))
                 .collect(Collectors.toList());
         gasCylinderChangeMap.put("useUnitCreditCode", String.format("%s_%s", completeDataSanHuanMap.get("useUnitName"), completeDataSanHuanMap.get("useUnitCreditCode")));
         gasCylinderChangeMap.put("dataList", equList);