1

src/main/java/com/example/backend/entity/common/CustCtrl.java

@@ -496,6 +496,10 @@ public class CustCtrl {
     @TableField(exist = false)
     private String signLoc;
 
+    //签约地
+    @TableField(exist = false)
+    private String cpal;
+
 
 
 

src/main/java/com/example/backend/entity/common/SysUser.java

@@ -270,6 +270,9 @@ public class SysUser {
     @TableField(exist = false)
     private BigDecimal rateUs;
 
+    @TableField(exist = false)
+    private BigDecimal rateUsd;
+
     //制单人部门编码
     @TableField(exist = false)
     private String deptCode;
@@ -278,6 +281,18 @@ public class SysUser {
     @TableField(exist = false)
     private String cpny;
 
+    @TableField(exist = false)
+    private String fourscode;
+
+//    @TableField(value="deptcode",exist = false)
+//    private String deptcode;
+
+    @TableField(exist = false)
+    private String fours;
+
+    @TableField(exist = false)
+    private String deptname;
+
     @TableField(exist = false)
     private String ctrylmbAddr;
 
@@ -285,4 +300,9 @@ public class SysUser {
 
 
 
+
+
+
+
+
 }

src/main/java/com/example/backend/excel/SalesCollectExcelDTO.java

@@ -23,7 +23,7 @@ public class SalesCollectExcelDTO {
     @ExcelProperty("账期(天)")
     private Integer payDays;
 
-    @ExcelProperty("收款方式")
+    @ExcelProperty("付款方式")
     private String payMode;
 
 

src/main/java/com/example/backend/mapper/contract/SysUserMapper.java

@@ -14,11 +14,11 @@ import java.util.List;
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("select\n" +
-            "       b.user_code,b.user_name,b.user_desc\n" +
-            "from SGGMIIP.View_Dept_Code a\n" +
-            "         left join SGGMIIP.View_User_Code b on a.deptid = b.dept_id\n" +
-            "         left join SGGMIIP.addrctrl c on a.fourscode = c.hrDeptCode\n" +
-            "where b.user_code =#{userCode}")
+            "    b.user_auto_id as id ,\n" +
+            "    c.fno,c.cpny,a.deptcode as deptCode,a.*,b.* from SGGMIIP.View_Dept_Code a\n" +
+            "    left join SGGMIIP.View_User_Code b on a.deptid=b.dept_id\n" +
+            "     left join SGGMIIP.addrctrl  c on a.fourscode=c.hrDeptCode\n" +
+            "where b.user_code = #{userCode}")
     List<SysUser> selectContractByNo(@Param("userCode") String userCode);
 
 

src/main/java/com/example/backend/service/contract/impl/SalesContractServiceImpl.java

@@ -167,10 +167,37 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同执行人代码有误！");
                         currentContractValid = false;
                     }
+
                     if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getUserDesc().isEmpty()) {
                         entity.setContrExecNm(contractUserList.get(0).getUserDesc());
                     }
 
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getDeptId().isEmpty()) {
+                        entity.setDeptId(contractUserList.get(0).getDeptId());
+                    }
+
+
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getFno().isEmpty()) {
+                        entity.setFno(contractUserList.get(0).getFno());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getFourscode().isEmpty()) {
+                        entity.setContrExecCdInstitutionId(contractUserList.get(0).getFourscode());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getCpny().isEmpty()) {
+                        entity.setContrExecCdInstitutionNm(contractUserList.get(0).getCpny());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !StringUtils.isEmpty(contractUserList.get(0).getDeptCode())) {
+                        entity.setContrExecCdDeptId(contractUserList.get(0).getDeptCode());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !StringUtils.isEmpty(contractUserList.get(0).getDeptName())) {
+                        entity.setContrExecCdDeptNm(contractUserList.get(0).getDeptName());
+                    }
+
                     if (StringUtils.isEmpty(entity.getCtName())) {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称不能为空！");
                         currentContractValid = false;
@@ -211,6 +238,11 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setCtNo(ctNameList.get(0).getFno());
                     }
 
+
+                    if (ctNameList != null && !ctNameList.isEmpty() && !ctNameList.get(0).getCtrylmbAddr().isEmpty()) {
+                        entity.setTrdCtry(ctNameList.get(0).getCtrylmbAddr());
+                    }
+
                     if (ctNameList != null && !ctNameList.isEmpty() && !ctNameList.get(0).getCtContNm().isEmpty()) {
                         entity.setCtContNm(ctNameList.get(0).getCtContNm());
                     }
@@ -227,6 +259,9 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：币别不能为空！");
                         currentContractValid = false;
                     }
+                    if (!StringUtils.isEmpty(entity.getCurcy())) {
+                        entity.setCurcy(entity.getCurcy().split("-")[0]);
+                    }
 
                     List<SysUser> curcyList = sysUserMapper.selectByCurcy(entity.getCurcy());
                     if (curcyList == null || curcyList.isEmpty()) {
@@ -249,6 +284,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setRateUs(curcyList.get(0).getRateUs());
                     }
 
+                    if (curcyList != null && !curcyList.isEmpty() && !Objects.isNull(curcyList.get(0).getRateUsd())) {
+                        entity.setRateUsd(curcyList.get(0).getRateUsd());
+                    }
+
                     if ("出口销售".equals(entity.getBizType()) || "转口销售".equals(entity.getBizType())) {
                         if (entity.getEstLoadDt() == null) {
                             currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同类型为出口销售或转口销售时，最迟装运日期不能为空！");
@@ -285,6 +324,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setOurBankNm(foursnameList.get(0).getOurBankNm());
                     }
 
+                    if (foursnameList != null && !foursnameList.isEmpty() && !foursnameList.get(0).getOurBankNm().isEmpty()) {
+                        entity.setOurBankNm(foursnameList.get(0).getOurBankNm());
+                    }
+
                     if (foursnameList != null && !foursnameList.isEmpty() && !foursnameList.get(0).getOurBankAcct().isEmpty()) {
                         entity.setOurBankAcct(foursnameList.get(0).getOurBankAcct());
                     }
@@ -293,10 +336,33 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setSignLoc(foursnameList.get(0).getSignLoc());
                     }
 
+
+
                     if (StringUtils.isEmpty(entity.getIfClearBottom())) {
                         entity.setIfClearBottom("否");
                     }
 
+
+                    // 设置默认值
+                    if (StringUtils.isEmpty(entity.getWhetherChartering())) {
+                        entity.setWhetherChartering("否");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfLongTerm())) {
+                        entity.setIfLongTerm("否");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfClearBottom())) {
+                        entity.setIfClearBottom("否");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfLegalCheck())) {
+                        entity.setIfLegalCheck("是");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfPayMultiple())) {
+                        entity.setIfPayMultiple("是");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfBidding())) {
+                        entity.setIfBidding("是");
+                    }
+
                     if ("铁矿石".equals(entity.getBizProductType()) || "煤炭".equals(entity.getBizProductType())) {
                         if (StringUtils.isEmpty(entity.getIfLongTerm())) {
                             currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同产品类型为铁矿石或煤炭时,是否长协不能为空");
@@ -381,25 +447,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentContractValid = false;
                     }
 
-                    // 设置默认值
-                    if (StringUtils.isEmpty(entity.getWhetherChartering())) {
-                        entity.setWhetherChartering("否");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfLongTerm())) {
-                        entity.setIfLongTerm("否");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfClearBottom())) {
-                        entity.setIfClearBottom("否");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfLegalCheck())) {
-                        entity.setIfLegalCheck("是");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfPayMultiple())) {
-                        entity.setIfPayMultiple("是");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfBidding())) {
-                        entity.setIfBidding("是");
-                    }
+
 
                     // 额外校验逻辑
                     boolean needValidate = false;
@@ -551,23 +599,23 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 }
                             }
 
-                            if (StringUtils.isEmpty(entity1.getCurcyPo())) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种不能为空！");
-                                currentContractValid = false;
-                            }
-
-                            List<CustCtrl> curcyList1 = custCtrlMapper.selectByCurcyPo(entity1.getCurcyPo());
-                            if (curcyList1 == null || curcyList1.isEmpty()) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种有误！");
-                                currentContractValid = false;
-                            }
+//                            if (StringUtils.isEmpty(entity1.getCurcyPo())) {
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种不能为空！");
+//                                currentContractValid = false;
+//                            }
 
-                            if (curcyList1 != null && !curcyList1.isEmpty() && !Objects.isNull(curcyList1.get(0).getRate()) && !Objects.isNull(entity1.getRatePo())) {
-                                if (entity1.getRatePo().compareTo(curcyList1.get(0).getRate()) != 0) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购汇率和匹配到的采购汇率不符!");
-                                    currentContractValid = false;
-                                }
-                            }
+//                            List<CustCtrl> curcyList1 = custCtrlMapper.selectByCurcyPo(entity1.getCurcyPo());
+//                            if (curcyList1 == null || curcyList1.isEmpty()) {
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种有误！");
+//                                currentContractValid = false;
+//                            }
+//
+//                            if (curcyList1 != null && !curcyList1.isEmpty() && !Objects.isNull(curcyList1.get(0).getRate()) && !Objects.isNull(entity1.getRatePo())) {
+//                                if (entity1.getRatePo().compareTo(curcyList1.get(0).getRate()) != 0) {
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购汇率和匹配到的采购汇率不符!");
+//                                    currentContractValid = false;
+//                                }
+//                            }
 
                             // 产品类型特定校验
                             if ("铁矿石".equals(bizProductType)) {

src/main/resources/mapper/SysUserMapper.xml

@@ -68,7 +68,7 @@
         order by a.fno
     </select>
     <select id="selectByCreateBy" resultType="com.example.backend.entity.common.SysUser">
-        select a.id,a.dept_code, a.DEPT_NAME,c.user_desc,c.USER_CODE
+        select a.id,a.dept_code as deptCode, a.DEPT_NAME,c.user_desc,c.USER_CODE
         from SGGMIIP.SYS_DEPARTMENT a
                  join SGGMIIP.SYS_USER_DEPARTMENT b on a.id = b.DEPT_ID
                  join SGGMIIP.SYS_USER c on b.USER_ID = c.id