Browse Source

采购合同备案程序上传

张庆宇 3 weeks ago
parent
commit
e9127adccb

+ 5
- 5
src/main/java/com/example/backend/entity/pccontract/PCcontractDtl.java View File

12
  * 合同交货明细从表
12
  * 合同交货明细从表
13
  */
13
  */
14
 @Data
14
 @Data
15
-@TableName("SGGMINFT.purchaseDtl")
15
+@TableName("SGGMIIP.purchaseDtl")
16
 public class PCcontractDtl extends BaseModelPur {
16
 public class PCcontractDtl extends BaseModelPur {
17
 
17
 
18
     private static final long serialVersionUID = 1L;
18
     private static final long serialVersionUID = 1L;
51
     @TableField("dryTonQty")
51
     @TableField("dryTonQty")
52
     private BigDecimal dryTonQty;
52
     private BigDecimal dryTonQty;
53
 
53
 
54
-    @TableField("priceMode")
55
-    private String priceMode;
54
+    @TableField("priceMtd")
55
+    private String priceMtd;
56
 
56
 
57
     @TableField("qty")
57
     @TableField("qty")
58
     private BigDecimal qty;
58
     private BigDecimal qty;
119
 
119
 
120
     @TableField("dept_id")
120
     @TableField("dept_id")
121
     private String deptId;
121
     private String deptId;
122
-    @TableField("fchno")
123
-    private int fchno;
122
+    //@TableField("fchno")
123
+    //private int fchno;
124
     @TableField(exist = false)
124
     @TableField(exist = false)
125
 
125
 
126
     private List<PCcontractDtl> purchaseDtls;
126
     private List<PCcontractDtl> purchaseDtls;

+ 1
- 1
src/main/java/com/example/backend/entity/pccontract/PCcontractPayment.java View File

15
  * 合同付款明细从表
15
  * 合同付款明细从表
16
  */
16
  */
17
 @Data
17
 @Data
18
-@TableName("SGGMINFT.purchasePayment")
18
+@TableName("SGGMIIP.purchasePayment")
19
 public class PCcontractPayment extends BaseModelPur {
19
 public class PCcontractPayment extends BaseModelPur {
20
 
20
 
21
     private static final long serialVersionUID = 1L;
21
     private static final long serialVersionUID = 1L;

+ 4
- 1
src/main/java/com/example/backend/entity/pccontract/PCcontractRCenterDtl.java View File

8
 import java.math.BigDecimal;
8
 import java.math.BigDecimal;
9
 
9
 
10
 @Data
10
 @Data
11
-@TableName("SGGMINFT.rCenterDtl")
11
+@TableName("SGGMIIP.rCenterDtl")
12
 public class PCcontractRCenterDtl extends BaseModelPur {
12
 public class PCcontractRCenterDtl extends BaseModelPur {
13
 
13
 
14
     private static final long serialVersionUID = 1L;
14
     private static final long serialVersionUID = 1L;
29
     @TableField("assessRatio")
29
     @TableField("assessRatio")
30
     private BigDecimal assessRatio;
30
     private BigDecimal assessRatio;
31
 
31
 
32
+    @TableField("assessQtyRate")
33
+    private BigDecimal assessQtyRate;
34
+
32
     @TableField("assessAmt")
35
     @TableField("assessAmt")
33
     private BigDecimal assessAmt;
36
     private BigDecimal assessAmt;
34
 
37
 

+ 5
- 1
src/main/java/com/example/backend/entity/pccontract/PurchaseContract.java View File

16
  * 销售合同主表
16
  * 销售合同主表
17
  */
17
  */
18
 @Data
18
 @Data
19
-@TableName("SGGMINFT.purchaseContract")
19
+@TableName("SGGMIIP.purchaseContract")
20
 public class PurchaseContract extends BaseModelPur {
20
 public class PurchaseContract extends BaseModelPur {
21
 
21
 
22
     private static final long serialVersionUID = 1L;
22
     private static final long serialVersionUID = 1L;
314
     @TableField("rateUsd")
314
     @TableField("rateUsd")
315
     private BigDecimal rateUsd;
315
     private BigDecimal rateUsd;
316
 
316
 
317
+    @TableField("rateUs")
318
+    private BigDecimal rateUs;
319
+
317
     @TableField("WhetherChartering")
320
     @TableField("WhetherChartering")
318
     private String WhetherChartering;
321
     private String WhetherChartering;
319
 
322
 
346
 
349
 
347
     @TableField("fchno")
350
     @TableField("fchno")
348
     private int fchno;
351
     private int fchno;
352
+
349
 }
353
 }

+ 1
- 1
src/main/java/com/example/backend/excel/PcContract/PcContractDtlDto.java View File

14
     @ExcelProperty("批次号")
14
     @ExcelProperty("批次号")
15
     private String batchNo;
15
     private String batchNo;
16
 
16
 
17
-    @ExcelProperty("商品编")
17
+    @ExcelProperty("商品编")
18
     private String itemno;
18
     private String itemno;
19
 
19
 
20
     @ExcelProperty("规格描述")
20
     @ExcelProperty("规格描述")

+ 3
- 3
src/main/java/com/example/backend/excel/PcContract/PcContractMainDto.java View File

40
     @ExcelProperty("数量短装%")
40
     @ExcelProperty("数量短装%")
41
     private BigDecimal qtyShort;
41
     private BigDecimal qtyShort;
42
 
42
 
43
-    @ExcelProperty("金额溢装%")
43
+    @ExcelProperty("金额溢装")
44
     private BigDecimal amtOver;
44
     private BigDecimal amtOver;
45
 
45
 
46
-    @ExcelProperty("金额短装%")
46
+    @ExcelProperty("金额短装")
47
     private BigDecimal amtShort;
47
     private BigDecimal amtShort;
48
 
48
 
49
     @ExcelProperty("币别")
49
     @ExcelProperty("币别")
50
     private String curcy;
50
     private String curcy;
51
 
51
 
52
-    @ExcelProperty("最迟装运日期")
52
+    @ExcelProperty("最迟装运时间")
53
     @DateTimeFormat("yyyy-MM-dd")
53
     @DateTimeFormat("yyyy-MM-dd")
54
     private Date estLoadDt;
54
     private Date estLoadDt;
55
 
55
 

+ 48
- 40
src/main/java/com/example/backend/service/contract/impl/PurchaseContractServiceImpl.java View File

142
      */
142
      */
143
     private Map<String, List<PcContractDtlDto>> buildDtlMap(List<PcContractDtlDto> excel_dtl) {
143
     private Map<String, List<PcContractDtlDto>> buildDtlMap(List<PcContractDtlDto> excel_dtl) {
144
         Map<String, List<PcContractDtlDto>> map = new HashMap<>();
144
         Map<String, List<PcContractDtlDto>> map = new HashMap<>();
145
-        if (excel_dtl != null) {
145
+        if (excel_dtl != null ) {
146
             for (PcContractDtlDto dtl : excel_dtl) {
146
             for (PcContractDtlDto dtl : excel_dtl) {
147
                 if (dtl.getPono() != null && !dtl.getPono().trim().isEmpty()) {
147
                 if (dtl.getPono() != null && !dtl.getPono().trim().isEmpty()) {
148
                     map.computeIfAbsent(dtl.getPono(), k -> new ArrayList<>()).add(dtl);
148
                     map.computeIfAbsent(dtl.getPono(), k -> new ArrayList<>()).add(dtl);
265
                 String code = mainItem.getSupName().substring(mainItem.getSupName().indexOf("-") + 1);
265
                 String code = mainItem.getSupName().substring(mainItem.getSupName().indexOf("-") + 1);
266
                 mainItem.setSupName(code);
266
                 mainItem.setSupName(code);
267
                 GongYingNameList = sysUserMapper.selectByGongYingName(code);
267
                 GongYingNameList = sysUserMapper.selectByGongYingName(code);
268
-                if (GongYingNameList != null && !GongYingNameList.isEmpty() && !"2".equals(GongYingNameList.get(0).getPlaced())) {
268
+                if (GongYingNameList == null ||  GongYingNameList.isEmpty() ) {
269
                     errorMsg.append("供应商名称没有审批通过; ");
269
                     errorMsg.append("供应商名称没有审批通过; ");
270
                 }
270
                 }
271
                 if (GongYingNameList != null && !GongYingNameList.isEmpty() && GongYingNameList.get(0).getFno().isEmpty()) {
271
                 if (GongYingNameList != null && !GongYingNameList.isEmpty() && GongYingNameList.get(0).getFno().isEmpty()) {
272
-                    errorMsg.append("供应商代没有审批通过; ");
272
+                    errorMsg.append("供应商代没有审批通过; ");
273
                 }
273
                 }
274
             }
274
             }
275
             if (mainItem.getCurcy() == null || mainItem.getCurcy().trim().isEmpty()) {
275
             if (mainItem.getCurcy() == null || mainItem.getCurcy().trim().isEmpty()) {
311
                     (mainItem.getServiceType() != null && mainItem.getServiceType().contains("主业")))) &&
311
                     (mainItem.getServiceType() != null && mainItem.getServiceType().contains("主业")))) &&
312
                     (mainItem.getLPort() == null || mainItem.getLPort().trim().isEmpty())) {
312
                     (mainItem.getLPort() == null || mainItem.getLPort().trim().isEmpty())) {
313
                 errorMsg.append("装运港不能为空; ");
313
                 errorMsg.append("装运港不能为空; ");
314
-            }else if (mainItem.getLPort() == null && mainItem.getLPort().trim().isEmpty()){
314
+            }else if (mainItem.getLPort() != null && !mainItem.getLPort().trim().isEmpty()){
315
                 lPortList = custCtrlMapper.selectLPortByLportName(mainItem.getLPort());
315
                 lPortList = custCtrlMapper.selectLPortByLportName(mainItem.getLPort());
316
                 if (lPortList == null || lPortList.isEmpty()) {
316
                 if (lPortList == null || lPortList.isEmpty()) {
317
                     errorMsg.append("装运港信息有误; ");
317
                     errorMsg.append("装运港信息有误; ");
318
-                } else if (lPortList != null && !lPortList.isEmpty() && (lPortList.get(0).getCountryName()== null || lPortList.get(0).getCountryName().isEmpty())) {
318
+                } else if (lPortList != null && !lPortList.isEmpty() && (lPortList.get(0).getCountryCnNm()== null || lPortList.get(0).getCountryCnNm().isEmpty())) {
319
                     errorMsg.append("装运港维护信息有误; ");
319
                     errorMsg.append("装运港维护信息有误; ");
320
                 }
320
                 }
321
             }
321
             }
325
                     (mainItem.getServiceType() != null && mainItem.getServiceType().contains("主业")))) &&
325
                     (mainItem.getServiceType() != null && mainItem.getServiceType().contains("主业")))) &&
326
                     (mainItem.getDPort() == null || mainItem.getDPort().trim().isEmpty())) {
326
                     (mainItem.getDPort() == null || mainItem.getDPort().trim().isEmpty())) {
327
                 errorMsg.append("目的港不能为空; ");
327
                 errorMsg.append("目的港不能为空; ");
328
-            }else if (mainItem.getDPort() == null && mainItem.getDPort().trim().isEmpty()){
328
+            }else if (mainItem.getDPort() != null && !mainItem.getDPort().trim().isEmpty()){
329
                 dPortList = custCtrlMapper.selectLPortByLportName(mainItem.getDPort());
329
                 dPortList = custCtrlMapper.selectLPortByLportName(mainItem.getDPort());
330
                 if (dPortList == null || dPortList.isEmpty()) {
330
                 if (dPortList == null || dPortList.isEmpty()) {
331
                     errorMsg.append("目的港信息有误; ");
331
                     errorMsg.append("目的港信息有误; ");
332
-                } else if (dPortList != null && !dPortList.isEmpty() && (dPortList.get(0).getCountryName()== null || dPortList.get(0).getCountryName().isEmpty())) {
332
+                } else if (dPortList != null && !dPortList.isEmpty() && (dPortList.get(0).getCountryCnNm()== null || dPortList.get(0).getCountryCnNm().isEmpty())) {
333
                     errorMsg.append("目的港维护信息有误; ");
333
                     errorMsg.append("目的港维护信息有误; ");
334
                 }
334
                 }
335
             }
335
             }
434
                     if (pay.getPayType()  == null || pay.getPayType().trim().isEmpty()){
434
                     if (pay.getPayType()  == null || pay.getPayType().trim().isEmpty()){
435
                         errorMsg.append("付款计划中款项类别不能为空; ");
435
                         errorMsg.append("付款计划中款项类别不能为空; ");
436
                     } else if (pay.getPayType() != null && !pay.getPayType().trim().isEmpty()) {
436
                     } else if (pay.getPayType() != null && !pay.getPayType().trim().isEmpty()) {
437
-                        validateSingleDictField(mainItem.getTerms(), "合同计划-款项类型", "合同计划-款项类型", allDicts, errorMsg);
437
+                        validateSingleDictField(pay.getPayType(), "合同计划-款项类型", "合同计划-款项类型", allDicts, errorMsg);
438
                     }
438
                     }
439
 
439
 
440
                     if (pay.getPayMethod()  == null || pay.getPayMethod().trim().isEmpty()){
440
                     if (pay.getPayMethod()  == null || pay.getPayMethod().trim().isEmpty()){
441
                         errorMsg.append("付款计划中付款方式不能为空; ");
441
                         errorMsg.append("付款计划中付款方式不能为空; ");
442
                     } else if (pay.getPayMethod() != null && !pay.getPayMethod().trim().isEmpty()) {
442
                     } else if (pay.getPayMethod() != null && !pay.getPayMethod().trim().isEmpty()) {
443
-                        validateSingleDictField(mainItem.getTerms(), "合同计划-付款方式", "合同计划-付款方式", allDicts, errorMsg);
443
+                        validateSingleDictField(pay.getPayMethod(), "合同计划-付款方式", "合同计划-付款方式", allDicts, errorMsg);
444
                     }
444
                     }
445
 
445
 
446
                     if (pay.getPayDays()  == null || pay.getPayDays().toString().trim().isEmpty()){
446
                     if (pay.getPayDays()  == null || pay.getPayDays().toString().trim().isEmpty()){
522
         contract.setServiceType(mainItem.getServiceType());
522
         contract.setServiceType(mainItem.getServiceType());
523
         contract.setBizType(mainItem.getBizType());
523
         contract.setBizType(mainItem.getBizType());
524
         contract.setBizProductType(mainItem.getBizProductType());
524
         contract.setBizProductType(mainItem.getBizProductType());
525
+        contract.setPriceCls(mainItem.getTerms());
525
         //根据查询“我方信息”结果填入部分数据
526
         //根据查询“我方信息”结果填入部分数据
526
-        contract.setFoursname(wofangNameList.get(0).getCountryName());
527
+        contract.setFoursname(wofangNameList.get(0).getCpny());
527
         contract.setFours(wofangNameList.get(0).getFno());
528
         contract.setFours(wofangNameList.get(0).getFno());
528
         contract.setOurBankNm(wofangNameList.get(0).getOurBankNm());
529
         contract.setOurBankNm(wofangNameList.get(0).getOurBankNm());
529
         contract.setOurBankAcct(wofangNameList.get(0).getOurBankAcct());
530
         contract.setOurBankAcct(wofangNameList.get(0).getOurBankAcct());
540
         //根据查询到的“币别”信息填入数据
541
         //根据查询到的“币别”信息填入数据
541
         contract.setCurcy(curcyList.get(0).getFname());
542
         contract.setCurcy(curcyList.get(0).getFname());
542
         contract.setRate(curcyList.get(0).getRate());
543
         contract.setRate(curcyList.get(0).getRate());
543
-        contract.setRateUsd(curcyList.get(0).getRateUs());
544
+        contract.setRateUs(curcyList.get(0).getRateUs());
544
         //根据查询到的“执行人”信息填入数据
545
         //根据查询到的“执行人”信息填入数据
545
         contract.setContrExecNm(ZhixingUserByList.get(0).getUserCode());
546
         contract.setContrExecNm(ZhixingUserByList.get(0).getUserCode());
546
         contract.setContrExecNm(ZhixingUserByList.get(0).getUserDesc());
547
         contract.setContrExecNm(ZhixingUserByList.get(0).getUserDesc());
585
         contract.setIfBidding("否");
586
         contract.setIfBidding("否");
586
 
587
 
587
         contract.setRemark("期初导入-采购");
588
         contract.setRemark("期初导入-采购");
589
+        contract.setFmodalid(8);
590
+        contract.setPlaced("0");
588
 
591
 
589
         purchaseContracts.add(contract);
592
         purchaseContracts.add(contract);
590
 
593
 
598
                 dtl.setSdesc(itemnoList.get(0).getSdesc());
601
                 dtl.setSdesc(itemnoList.get(0).getSdesc());
599
                 dtl.setBrand(itemnoList.get(0).getBrand());
602
                 dtl.setBrand(itemnoList.get(0).getBrand());
600
                 dtl.setFtype3(dtlDto.getSpec());
603
                 dtl.setFtype3(dtlDto.getSpec());
601
-                dtl.setUt(dtl.getUt());
604
+                dtl.setUt(dtlDto.getUt());
602
                 dtl.setQty(dtlDto.getQty());
605
                 dtl.setQty(dtlDto.getQty());
603
-                dtl.setPoPrice(dtl.getPoPrice());
604
-                dtl.setMoisture(dtl.getMoisture());
605
-                dtl.setPriceMode(dtl.getPriceMode());
606
+                dtl.setPoPrice(dtlDto.getPoprice());
607
+                dtl.setMoisture(dtlDto.getMoisture());
608
+                dtl.setPriceMtd(dtlDto.getPriceMtd());
609
+                dtl.setInputTaxRate(dtlDto.getInTaxRate());
610
+                dtl.setIronCont(dtlDto.getIronCont());
611
+                dtl.setPoAmt(dtlDto.getPoamt());
606
 
612
 
607
                 pCcontractDtls.add(dtl);
613
                 pCcontractDtls.add(dtl);
608
             }
614
             }
617
                 payment.setPayType(payDto.getPayType());
623
                 payment.setPayType(payDto.getPayType());
618
                 payment.setPayMethod(payDto.getPayMethod());
624
                 payment.setPayMethod(payDto.getPayMethod());
619
                 payment.setPayRatio(payDto.getPayRatio());
625
                 payment.setPayRatio(payDto.getPayRatio());
620
-                payment.setPayAmt(payment.getPayAmt());
621
-                payment.setPayDays(payment.getPayDays());
626
+                payment.setPayAmt(String.valueOf(payDto.getPayAmt()));
627
+                payment.setPayDays(String.valueOf(payDto.getPayDays()));
622
                 pCcontractPayments.add(payment);
628
                 pCcontractPayments.add(payment);
623
             }
629
             }
624
         }
630
         }
626
         // 转换责任中心数据
632
         // 转换责任中心数据
627
         if (rcentList != null) {
633
         if (rcentList != null) {
628
             for (PcContractRCentDto rcentDto : rcentList) {
634
             for (PcContractRCentDto rcentDto : rcentList) {
629
-                PCcontractRCenterDtl rcent = convertToPCcontractRCenterDtl(rcentDto);
635
+                PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
636
+                rcent.setPono(mainItem.getPono());
637
+                rcent.setCreateBy(rcentDto.getCreate_by());
638
+                List<SysUser> createByList = sysUserMapper.selectByCreateBy(rcentDto.getCreate_by());
639
+                if (createByList != null && !createByList.isEmpty()) {
640
+                    rcent.setDeptId(createByList.get(0).getDeptCode());
641
+                    rcent.setDeptName(createByList.get(0).getDeptName());
642
+                    rcent.setCreateByName(createByList.get(0).getUserDesc());
643
+                }
644
+                rcent.setAssessQtyRate(rcentDto.getAssessQtyRate());
645
+                rcent.setAssessRatio(rcentDto.getAssessRatio());
630
                 pCcontractRCenterDtls.add(rcent);
646
                 pCcontractRCenterDtls.add(rcent);
631
             }
647
             }
648
+        }else {
649
+            PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
650
+            rcent.setPono(mainItem.getPono());
651
+            rcent.setCreateBy(mainItem.getCreate_by());
652
+            List<SysUser> createByList = sysUserMapper.selectByCreateBy(mainItem.getCreate_by());
653
+            if (createByList != null && !createByList.isEmpty()) {
654
+                rcent.setDeptId(createByList.get(0).getDeptCode());
655
+                rcent.setDeptName(createByList.get(0).getDeptName());
656
+                rcent.setCreateByName(createByList.get(0).getUserDesc());
657
+            }
658
+            rcent.setAssessQtyRate(new BigDecimal(100));
659
+            rcent.setAssessRatio(new BigDecimal(100));
660
+            pCcontractRCenterDtls.add(rcent);
632
         }
661
         }
633
     }
662
     }
634
 
663
 
635
-
636
-    /**
637
-     * 转换付款计划数据
638
-     */
639
-    private PCcontractPayment convertToPCcontractPayment(PcContractPayDto dto) {
640
-        PCcontractPayment payment = new PCcontractPayment();
641
-
642
-
643
-        return payment;
644
-    }
645
-
646
-    /**
647
-     * 转换责任中心数据
648
-     */
649
-    private PCcontractRCenterDtl convertToPCcontractRCenterDtl(PcContractRCentDto dto) {
650
-        PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
651
-
652
-
653
-        return rcent;
654
-    }
655
-
656
     /**
664
     /**
657
      * 创建合同错误信息对象
665
      * 创建合同错误信息对象
658
      */
666
      */
741
     private void saveContractDetails(String mainId, List<PCcontractDtl> dtlList, String pono) {
749
     private void saveContractDetails(String mainId, List<PCcontractDtl> dtlList, String pono) {
742
         for (PCcontractDtl dtl : dtlList) {
750
         for (PCcontractDtl dtl : dtlList) {
743
             if (pono.equals(dtl.getPono())) {
751
             if (pono.equals(dtl.getPono())) {
744
-                dtl.setRid(mainId);
752
+                dtl.setRrid(mainId);
745
                 pCcontractDtlMapper.insert(dtl);
753
                 pCcontractDtlMapper.insert(dtl);
746
             }
754
             }
747
         }
755
         }

+ 7
- 7
src/main/java/com/example/backend/util/PcExcelUtil.java View File

23
     public static List<PcContractMainDto> readPcMainExcelSync(MultipartFile file) {
23
     public static List<PcContractMainDto> readPcMainExcelSync(MultipartFile file) {
24
         try (InputStream inputStream = file.getInputStream()) {
24
         try (InputStream inputStream = file.getInputStream()) {
25
             return EasyExcel.read(inputStream)
25
             return EasyExcel.read(inputStream)
26
-                    .head(PcContractPayDto.class)
26
+                    .head(PcContractMainDto.class)
27
                     .sheet("合同主表")
27
                     .sheet("合同主表")
28
-                    .headRowNumber(4)
28
+                    .headRowNumber(1)
29
                     .doReadSync();
29
                     .doReadSync();
30
         } catch (IOException e) {
30
         } catch (IOException e) {
31
             System.out.println("读取Excel文件失败: " + e.getMessage());
31
             System.out.println("读取Excel文件失败: " + e.getMessage());
40
     public static List<PcContractDtlDto> readPcDtlExcelSync(MultipartFile file) {
40
     public static List<PcContractDtlDto> readPcDtlExcelSync(MultipartFile file) {
41
         try (InputStream inputStream = file.getInputStream()) {
41
         try (InputStream inputStream = file.getInputStream()) {
42
             return EasyExcel.read(inputStream)
42
             return EasyExcel.read(inputStream)
43
-                    .head(PcContractPayDto.class)
43
+                    .head(PcContractDtlDto.class)
44
                     .sheet("合同商品明细")
44
                     .sheet("合同商品明细")
45
-                    .headRowNumber(3)
45
+                    .headRowNumber(1)
46
                     .doReadSync();
46
                     .doReadSync();
47
         } catch (IOException e) {
47
         } catch (IOException e) {
48
             System.out.println("读取Excel文件失败: " + e.getMessage());
48
             System.out.println("读取Excel文件失败: " + e.getMessage());
59
             return EasyExcel.read(inputStream)
59
             return EasyExcel.read(inputStream)
60
                     .head(PcContractPayDto.class)
60
                     .head(PcContractPayDto.class)
61
                     .sheet("付款计划")
61
                     .sheet("付款计划")
62
-                    .headRowNumber(3)
62
+                    .headRowNumber(1)
63
                     .doReadSync();
63
                     .doReadSync();
64
         } catch (IOException e) {
64
         } catch (IOException e) {
65
             System.out.println("读取Excel文件失败: " + e.getMessage());
65
             System.out.println("读取Excel文件失败: " + e.getMessage());
74
     public static List<PcContractRCentDto> readPcRcentExcelSync(MultipartFile file) {
74
     public static List<PcContractRCentDto> readPcRcentExcelSync(MultipartFile file) {
75
         try (InputStream inputStream = file.getInputStream()) {
75
         try (InputStream inputStream = file.getInputStream()) {
76
             return EasyExcel.read(inputStream)
76
             return EasyExcel.read(inputStream)
77
-                    .head(PcContractPayDto.class)
77
+                    .head(PcContractRCentDto.class)
78
                     .sheet("责任中心")
78
                     .sheet("责任中心")
79
-                    .headRowNumber(3)
79
+                    .headRowNumber(1)
80
                     .doReadSync();
80
                     .doReadSync();
81
         } catch (IOException e) {
81
         } catch (IOException e) {
82
             System.out.println("读取Excel文件失败: " + e.getMessage());
82
             System.out.println("读取Excel文件失败: " + e.getMessage());

+ 1
- 1
src/main/resources/application.yml View File

11
   datasource:
11
   datasource:
12
     driver-class-name: dm.jdbc.driver.DmDriver
12
     driver-class-name: dm.jdbc.driver.DmDriver
13
     url: jdbc:dm://10.19.13.211:5236
13
     url: jdbc:dm://10.19.13.211:5236
14
-    username: SGGMINFT
14
+    username: SGGMIIP
15
     password: SXxxjsgs2025
15
     password: SXxxjsgs2025
16
     druid:
16
     druid:
17
       initial-size: 5
17
       initial-size: 5

+ 3
- 5
src/main/resources/mapper/SysUserMapper.xml View File

55
         case when nvl(b.bankNm,'')='' then '' else  nvl(b.bankNm,'')  end  as ctBankName,
55
         case when nvl(b.bankNm,'')='' then '' else  nvl(b.bankNm,'')  end  as ctBankName,
56
         case when nvl(b.bankAcct,'')='' then '' else  nvl(b.bankAcct,'')  end  as ctBankAcct,
56
         case when nvl(b.bankAcct,'')='' then '' else  nvl(b.bankAcct,'')  end  as ctBankAcct,
57
         case when nvl(c.name,'')='' then '' else  nvl(c.name,'')  end  as ctContNm
57
         case when nvl(c.name,'')='' then '' else  nvl(c.name,'')  end  as ctContNm
58
-
59
-        from custctrl a
58
+        from SGGMIIP.custctrl a
60
         LEFT JOIN (
59
         LEFT JOIN (
61
         SELECT  rid , bankNm , bankAcct , ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num
60
         SELECT  rid , bankNm , bankAcct , ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num
62
-        FROM custbank   WHERE NVL(del_flag, 0) != 1
61
+        FROM SGGMIIP.custbank   WHERE NVL(del_flag, 0) != 1
63
         ) b ON a.id = b.rid AND b.row_num = 1
62
         ) b ON a.id = b.rid AND b.row_num = 1
64
-        left join custattn c on a.id = c.rid
63
+        left join SGGMIIP.custattn c on a.id = c.rid
65
         where ifnull(a.del_flag, 0) != 1
64
         where ifnull(a.del_flag, 0) != 1
66
-        and (checkPermission('客商管理', a) or a.rptg is null or a.rptg = '' )
67
         and INSTR(ctNature, '供应商') > 0
65
         and INSTR(ctNature, '供应商') > 0
68
         and nvl(ctStatus,'')='已准入'
66
         and nvl(ctStatus,'')='已准入'
69
         and a.ctCnNm = #{ctName}
67
         and a.ctCnNm = #{ctName}

Loading…
Cancel
Save