2 Revize 3762e219cd ... d6bda84bb8

Autor SHA1 Zpráva Datum
  lfy d6bda84bb8 分页显示仓库容量 před 2 týdny
  lfy 97085ee9cc 修改仓饭容量显示 před 2 týdny

+ 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 55
 import org.springframework.validation.annotation.Validated;
56 56
 
57 57
 import javax.annotation.Resource;
58
+import java.math.BigDecimal;
59
+import java.math.RoundingMode;
58 60
 import java.util.ArrayList;
59 61
 import java.util.Arrays;
60 62
 import java.util.List;
@@ -286,6 +288,12 @@ public class DwxxServiceImpl implements DwxxService {
286 288
             } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
287 289
                 List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
288 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 297
                     List<StoreRespVO> selectedStoreSForNation = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
290 298
                     return selectedStoreSForNation;
291 299
                 }
@@ -351,6 +359,12 @@ public class DwxxServiceImpl implements DwxxService {
351 359
                                 }
352 360
                             }
353 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 368
                                 storeListForProvice = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
355 369
                             }
356 370
                             return storeListForProvice;

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

@@ -17,7 +17,7 @@
17 17
                 cc.CAMC,
18 18
                 cc.CFLX,
19 19
                 cc.CAZT,
20
-                cc.SJCR,
20
+                TRUNC(cc.SJCR) sjcr,
21 21
                 cc.yxcf
22 22
         from  DELIVERY_CAXX cc
23 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 410
                 cc.CAMC,
411 411
                 cc.CFLX,
412 412
                 cc.CAZT,
413
-                cc.SJCR,
413
+                TRUNC(cc.SJCR) sjcr,
414 414
                 LISTAGG(DISTINCT bk.RDYH_NAME, ',') rdyh_name
415 415
         from DELIVERY_CAXX cc
416 416
         join DELIVERY_BANK bk on cc.id=bk.CA_ID
@@ -435,7 +435,7 @@
435 435
                 cc.CAMC,
436 436
                 cc.CFLX,
437 437
                 cc.CAZT,
438
-                cc.SJCR,
438
+                TRUNC(cc.SJCR) sjcr,
439 439
                 t1.RDYH_NAME,
440 440
                 t1.CCZT,
441 441
                 t1.NICKNAME,

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

@@ -12,7 +12,7 @@
12 12
             cd.TYXYDM,
13 13
             cd.DWMC,
14 14
             ck.KQMC,
15
-            ifnull(t1.sjcrNum, 0) sjcrNum,
15
+            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
16 16
             ifnull(t1.cfnum, 0) cfnum,
17 17
             ifnull(t2.yxcfnum, 0) yxcfnum,
18 18
             ck.xzqhdm
@@ -95,7 +95,7 @@
95 95
             cd.TYXYDM,
96 96
             cd.DWMC,
97 97
             ck.KQMC,
98
-            ifnull(t1.sjcrNum, 0) sjcrNum,
98
+            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
99 99
             ifnull(t1.cfnum, 0) cfnum,
100 100
             ifnull(t2.yxcfnum, 0) yxcfnum
101 101
         from  DELIVERY_DWXX cd
@@ -175,7 +175,7 @@
175 175
             cd.TYXYDM,
176 176
             cd.DWMC,
177 177
             ck.KQMC,
178
-            ifnull(t1.sjcrNum, 0) sjcrNum,
178
+            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
179 179
             ifnull(t1.cfnum, 0) cfnum,
180 180
             ifnull(t3.yxcfnum, 0) yxcfnum,
181 181
             ifnull(t2.SYNDZZC, 0) zzc,
@@ -276,8 +276,9 @@
276 276
                 cc.ID  ,
277 277
                 cc.KQMC,
278 278
                 cc.CAMC,
279
+
279 280
                 cc.CFLX,
280
-                cc.CAZT,
281
+                TRUNC(cc.SJCR)  sjcr,
281 282
                 cc.SJCR
282 283
         from  CODING_CAXX cc
283 284
         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 17
                 cc.CAMC,
18 18
                 cc.CFLX,
19 19
                 cc.CAZT,
20
-                cc.SJCR,
20
+                TRUNC(cc.SJCR) sjcr,
21 21
                 cc.yxcf
22 22
         from  DELIVERY_CAXX cc
23 23
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID
@@ -52,7 +52,7 @@
52 52
                 cc.CAMC,
53 53
                 cc.CFLX,
54 54
                 cc.CAZT,
55
-                cc.SJCR,
55
+                TRUNC(cc.SJCR)  sjcr,
56 56
                 cc.yxcf
57 57
         from  DELIVERY_CAXX cc
58 58
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID