Bladeren bron

完成对销售合同ExceL导入校验代码的基本开发

胡北宽 4 maanden geleden
bovenliggende
commit
faa5eb1695

+ 14
- 0
src/main/java/com/example/backend/entity/common/CustCtrl.java Bestand weergeven

@@ -473,8 +473,22 @@ public class CustCtrl {
473 473
     private BigDecimal bankAcct;
474 474
 
475 475
     //部门编码
476
+    @TableField(exist = false)
476 477
     private String deptCdoe;
477 478
 
479
+    //费用代码
480
+    @TableField(exist = false)
481
+    private String feeCd;
482
+
483
+    //费用名称
484
+    @TableField(exist = false)
485
+    private String feeNm;
486
+
487
+    //费用分摊类型
488
+    @TableField(exist = false)
489
+    private String allocationCategory;
490
+
491
+
478 492
 
479 493
 
480 494
 

+ 4
- 0
src/main/java/com/example/backend/entity/contract/ExpSvcRateEntity.java Bestand weergeven

@@ -120,4 +120,8 @@ public class ExpSvcRateEntity {
120 120
     // 当前版本号
121 121
     @TableField("curChangeVer")
122 122
     private Integer curChangeVer;
123
+
124
+    //销售合同号
125
+    @TableField("fno")
126
+    private String fno;
123 127
 }

+ 3
- 0
src/main/java/com/example/backend/excel/ExpSvcRateExcelDTO.java Bestand weergeven

@@ -92,4 +92,7 @@ public class ExpSvcRateExcelDTO {
92 92
 
93 93
     @ExcelProperty("当前版本号")
94 94
     private Integer curChangeVer;
95
+
96
+    @ExcelProperty("销售合同号")
97
+    private String fno;
95 98
 }

+ 4
- 4
src/main/java/com/example/backend/excel/FeeDtlExcelDTO.java Bestand weergeven

@@ -18,7 +18,7 @@ public class FeeDtlExcelDTO {
18 18
     @ExcelProperty("预估费用代码")
19 19
     private String feeCd;
20 20
 
21
-    @ExcelProperty("预估费用名称")
21
+    @ExcelProperty("费用名称")
22 22
     private String feeNm;
23 23
 
24 24
     @ExcelProperty("币种")
@@ -27,7 +27,7 @@ public class FeeDtlExcelDTO {
27 27
     @ExcelProperty("汇率")
28 28
     private BigDecimal rate;
29 29
 
30
-    @ExcelProperty("费用金额(含税)")
30
+    @ExcelProperty("费用金额")
31 31
     private BigDecimal feeAmt;
32 32
 
33 33
     @ExcelProperty("费用描述")
@@ -102,7 +102,7 @@ public class FeeDtlExcelDTO {
102 102
     @ExcelProperty("费用承担方")
103 103
     private String feePayer;
104 104
 
105
-    @ExcelProperty("费用单据号码")
105
+    @ExcelProperty("销售合同号")
106 106
     private String fno;
107 107
 
108 108
     @ExcelProperty("部门名称")
@@ -123,7 +123,7 @@ public class FeeDtlExcelDTO {
123 123
     @ExcelProperty("美元汇率")
124 124
     private BigDecimal rateUsd;
125 125
 
126
-    @ExcelProperty("费用税率")
126
+    @ExcelProperty("费用税率%")
127 127
     private BigDecimal taxRate;
128 128
 
129 129
     @ExcelProperty("大类代码")

+ 2
- 2
src/main/java/com/example/backend/excel/SalesContractExcelDTO.java Bestand weergeven

@@ -15,13 +15,13 @@ public class SalesContractExcelDTO {
15 15
     @ExcelProperty("主键ID")
16 16
     private Long id;
17 17
 
18
-    @ExcelProperty("单据号码")
18
+    @ExcelProperty("销售合同号")
19 19
     private String fno;
20 20
 
21 21
     @ExcelProperty("单据日期")
22 22
     private LocalDateTime fdate;
23 23
 
24
-    @ExcelProperty("销售合同号")
24
+    @ExcelProperty("销售合同号1")
25 25
     private String sono;
26 26
 
27 27
     @ExcelProperty("客户合同号")

+ 1
- 0
src/main/java/com/example/backend/mapper/contract/CustCtrlMapper.java Bestand weergeven

@@ -44,4 +44,5 @@ public interface CustCtrlMapper extends BaseMapper<CustCtrl> {
44 44
     List<CustCtrl> selectByPersonDeptNm(@Param("personDeptNm") String personDeptNm);
45 45
 
46 46
 
47
+    List<CustCtrl> selectByFeeNm(@Param("feeNm") String feeNm);
47 48
 }

+ 2
- 0
src/main/java/com/example/backend/mapper/contract/DicMapper.java Bestand weergeven

@@ -31,4 +31,6 @@ public interface DicMapper extends BaseMapper<DataDic> {
31 31
     List<DataDic> selectByPriceMtd(@Param("priceMtd") String priceMtd);
32 32
 
33 33
     List<DataDic> selectByFtyped(@Param("ftype4") String ftype4);
34
+
35
+    List<DataDic> selectByPaymentType(@Param("paymentType") String paymentType);
34 36
 }

+ 631
- 489
src/main/java/com/example/backend/service/contract/impl/SalesContractServiceImpl.java
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 7
- 0
src/main/resources/mapper/CustCtrlMapper.xml Bestand weergeven

@@ -144,4 +144,11 @@
144 144
              ) t
145 145
         where t.deptname =#{personDeptNm}
146 146
     </select>
147
+    <select id="selectByFeeNm" resultType="com.example.backend.entity.common.CustCtrl">
148
+        select cateCode,cateName,feeCd,feeNm,allocationCategory
149
+        from SGGMIIP.fytypedtl
150
+        where ifnull(del_flag, 0) != 1
151
+          and feeNm = #{feeNm}
152
+        order by cateCode,feeCd
153
+    </select>
147 154
 </mapper>

+ 9
- 0
src/main/resources/mapper/DicMapper.xml Bestand weergeven

@@ -57,4 +57,13 @@
57 57
           and i.status = '0'
58 58
           and d.status = '0'
59 59
     </select>
60
+    <select id="selectByPaymentType" resultType="com.example.backend.entity.common.DataDic">
61
+        select d.dic_name, i.item_value
62
+        from SGGMIIP.data_dic d
63
+                 left join SGGMIIP.data_item i on d.id = i.dic_id
64
+        where i.item_value = #{paymentType}
65
+          and d.dic_name = '代理协议款项类别'
66
+          and i.status = '0'
67
+          and d.status = '0'
68
+    </select>
60 69
 </mapper>

Laden…
Annuleren
Opslaan