Browse Source

修改仓饭容量显示

lfy 2 weeks ago
parent
commit
97085ee9cc

+ 14 - 0
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -55,6 +55,8 @@ import org.springframework.transaction.annotation.Transactional;
55
 import org.springframework.validation.annotation.Validated;
55
 import org.springframework.validation.annotation.Validated;
56
 
56
 
57
 import javax.annotation.Resource;
57
 import javax.annotation.Resource;
58
+import java.math.BigDecimal;
59
+import java.math.RoundingMode;
58
 import java.util.ArrayList;
60
 import java.util.ArrayList;
59
 import java.util.Arrays;
61
 import java.util.Arrays;
60
 import java.util.List;
62
 import java.util.List;
@@ -286,6 +288,12 @@ public class DwxxServiceImpl implements DwxxService {
286
             } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
288
             } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
287
                 List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
289
                 List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
288
                 if (!ObjectUtils.isEmpty(caxxDOS)) {
290
                 if (!ObjectUtils.isEmpty(caxxDOS)) {
291
+                    caxxDOS.stream().forEach(s->{
292
+                        if (s.getSjcr()!=null) {
293
+                            BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
294
+                            s.setSjcr(truncatedNumber);
295
+                        }
296
+                    });
289
                     List<StoreRespVO> selectedStoreSForNation = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
297
                     List<StoreRespVO> selectedStoreSForNation = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
290
                     return selectedStoreSForNation;
298
                     return selectedStoreSForNation;
291
                 }
299
                 }
@@ -351,6 +359,12 @@ public class DwxxServiceImpl implements DwxxService {
351
                                 }
359
                                 }
352
                             }
360
                             }
353
                             if (!ObjectUtils.isEmpty(caxxDOS)) {
361
                             if (!ObjectUtils.isEmpty(caxxDOS)) {
362
+                                caxxDOS.stream().forEach(s->{
363
+                                    if (s.getSjcr()!=null) {
364
+                                        BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
365
+                                        s.setSjcr(truncatedNumber);
366
+                                    }
367
+                                });
354
                                 storeListForProvice = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
368
                                 storeListForProvice = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
355
                             }
369
                             }
356
                             return storeListForProvice;
370
                             return storeListForProvice;

+ 1 - 1
delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/bank/BankMapper.xml

@@ -17,7 +17,7 @@
17
                 cc.CAMC,
17
                 cc.CAMC,
18
                 cc.CFLX,
18
                 cc.CFLX,
19
                 cc.CAZT,
19
                 cc.CAZT,
20
-                cc.SJCR,
20
+                TRUNC(cc.SJCR),
21
                 cc.yxcf
21
                 cc.yxcf
22
         from  DELIVERY_CAXX cc
22
         from  DELIVERY_CAXX cc
23
         join  DELIVERY_BANK bk on bk.CA_ID=cc.ID
23
         join  DELIVERY_BANK bk on bk.CA_ID=cc.ID

+ 2 - 2
delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -410,7 +410,7 @@
410
                 cc.CAMC,
410
                 cc.CAMC,
411
                 cc.CFLX,
411
                 cc.CFLX,
412
                 cc.CAZT,
412
                 cc.CAZT,
413
-                cc.SJCR,
413
+                TRUNC(cc.SJCR),
414
                 LISTAGG(DISTINCT bk.RDYH_NAME, ',') rdyh_name
414
                 LISTAGG(DISTINCT bk.RDYH_NAME, ',') rdyh_name
415
         from DELIVERY_CAXX cc
415
         from DELIVERY_CAXX cc
416
         join DELIVERY_BANK bk on cc.id=bk.CA_ID
416
         join DELIVERY_BANK bk on cc.id=bk.CA_ID
@@ -435,7 +435,7 @@
435
                 cc.CAMC,
435
                 cc.CAMC,
436
                 cc.CFLX,
436
                 cc.CFLX,
437
                 cc.CAZT,
437
                 cc.CAZT,
438
-                cc.SJCR,
438
+                TRUNC(cc.SJCR),
439
                 t1.RDYH_NAME,
439
                 t1.RDYH_NAME,
440
                 t1.CCZT,
440
                 t1.CCZT,
441
                 t1.NICKNAME,
441
                 t1.NICKNAME,

+ 1 - 1
delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -277,7 +277,7 @@
277
                 cc.KQMC,
277
                 cc.KQMC,
278
                 cc.CAMC,
278
                 cc.CAMC,
279
                 cc.CFLX,
279
                 cc.CFLX,
280
-                cc.CAZT,
280
+                TRUNC(cc.SJCR),
281
                 cc.SJCR
281
                 cc.SJCR
282
         from  CODING_CAXX cc
282
         from  CODING_CAXX cc
283
         join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID
283
         join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID

+ 2 - 2
delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/province/ProvinceMapper.xml

@@ -17,7 +17,7 @@
17
                 cc.CAMC,
17
                 cc.CAMC,
18
                 cc.CFLX,
18
                 cc.CFLX,
19
                 cc.CAZT,
19
                 cc.CAZT,
20
-                cc.SJCR,
20
+                TRUNC(cc.SJCR),
21
                 cc.yxcf
21
                 cc.yxcf
22
         from  DELIVERY_CAXX cc
22
         from  DELIVERY_CAXX cc
23
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID
23
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID
@@ -52,7 +52,7 @@
52
                 cc.CAMC,
52
                 cc.CAMC,
53
                 cc.CFLX,
53
                 cc.CFLX,
54
                 cc.CAZT,
54
                 cc.CAZT,
55
-                cc.SJCR,
55
+                TRUNC(cc.SJCR),
56
                 cc.yxcf
56
                 cc.yxcf
57
         from  DELIVERY_CAXX cc
57
         from  DELIVERY_CAXX cc
58
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID
58
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID