1.完成对销售合同产品明细表的检验导入2.完成对收款计划和责任中心的校验导入

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

@@ -436,6 +436,10 @@ public class CustCtrl {
     @TableField(exist = false)
     private String hsNameEn;
 
+    //牌号
+    @TableField(exist = false)
+    private String brand;
+
     //增值税率
     @TableField(exist = false)
     private BigDecimal inTaxRate;
@@ -448,6 +452,30 @@ public class CustCtrl {
     @TableField(exist = false)
     private BigDecimal rate;
 
+    //规格代码
+    @TableField(exist = false)
+    private String steelProductSpecNo;
+
+    //规格描述
+    @TableField(exist = false)
+    private String steelProductSpecularity;
+
+    //米重
+    @TableField(exist = false)
+    private BigDecimal fnum4;
+
+    //收款收证银行名称
+    @TableField(exist = false)
+    private BigDecimal bankNm;
+
+    //收款收证银行账号
+    @TableField(exist = false)
+    private BigDecimal bankAcct;
+
+    //部门编码
+    private String deptCdoe;
+
+
 
 
 

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

@@ -270,6 +270,13 @@ public class SysUser {
     @TableField(exist = false)
     private BigDecimal rateUsd;
 
+    //制单人部门编码
+    @TableField(exist = false)
+    private String deptCode;
+
+
+
+
 
 
 }

src/main/java/com/example/backend/entity/contract/SalesCollectMethodEntity.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 销售合同收款方式
+ * 销售合同收款计划
  */
 @Data
 @TableName("SGGMIIP.salesCollectMethod")

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

@@ -24,7 +24,7 @@ public class RCenterDtlExcelDTO {
     @ExcelProperty("责任中心名称")
     private String respCtrName;
 
-    @ExcelProperty("考核占比")
+    @ExcelProperty("金额考核占比%")
     private BigDecimal assessRatio;
 
     @ExcelProperty("占比金额")
@@ -33,7 +33,7 @@ public class RCenterDtlExcelDTO {
     @ExcelProperty("流程实例id")
     private String processInstanceId;
 
-    @ExcelProperty("单据号")
+    @ExcelProperty("销售合同号")
     private String fno;
 
     @ExcelProperty("单据日期")
@@ -72,7 +72,7 @@ public class RCenterDtlExcelDTO {
     @ExcelProperty("是否删除")
     private Integer delFlag;
 
-    @ExcelProperty("创建账号")
+    @ExcelProperty("制单人代码")
     private String createBy;
 
     @ExcelProperty("创建时间")
@@ -90,16 +90,16 @@ public class RCenterDtlExcelDTO {
     @ExcelProperty("更新人")
     private String updateByName;
 
-    @ExcelProperty("部门名称")
+    @ExcelProperty("制单人部门名称")
     private String deptName;
 
-    @ExcelProperty("部门代码")
+    @ExcelProperty("制单人部门代码")
     private String deptId;
 
     @ExcelProperty("当前版本号")
     private Integer curChangeVer;
 
-    @ExcelProperty("利润占比")
+    @ExcelProperty("利润考核占比%")
     private BigDecimal assessQtyRate;
 
     @ExcelProperty("人员代码")
@@ -108,16 +108,16 @@ public class RCenterDtlExcelDTO {
     @ExcelProperty("人员名称")
     private String personname;
 
-    @ExcelProperty("人员部门代码")
+    @ExcelProperty("部门代码")
     private String personDeptId;
 
-    @ExcelProperty("人员部门名称")
+    @ExcelProperty("部门名称")
     private String personDeptNm;
 
-    @ExcelProperty("人员公司代码")
+    @ExcelProperty("公司代码")
     private String institutionId;
 
-    @ExcelProperty("人员公司名称")
+    @ExcelProperty("公司名称")
     private String institutionNm;
 
     @ExcelProperty("保供合同一键三联id")

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

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * 销售合同收款方式
+ * 销售合同收款计划
  */
 @Data
 public class SalesCollectExcelDTO {
@@ -27,13 +27,13 @@ public class SalesCollectExcelDTO {
     @ExcelProperty("付款方式")
     private String payMode;
 
-    @ExcelProperty("条款备注")
+    @ExcelProperty("备注")
     private String clauseRemark;
 
     @ExcelProperty("流程实例id")
     private String processInstanceId;
 
-    @ExcelProperty("单据号")
+    @ExcelProperty("销售合同号")
     private String fno;
 
     @ExcelProperty("单据日期")
@@ -105,10 +105,10 @@ public class SalesCollectExcelDTO {
     @ExcelProperty("账期")
     private Integer payDays;
 
-    @ExcelProperty("银行名称")
+    @ExcelProperty("收款收证银行名称")
     private String ourBankNm;
 
-    @ExcelProperty("银行账户")
+    @ExcelProperty("收款收证银行账户")
     private String ourBankAcct;
 
     @ExcelProperty("来源类型")

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

@@ -34,4 +34,14 @@ public interface CustCtrlMapper extends BaseMapper<CustCtrl> {
     List<CustCtrl> selectByResourceNo(@Param("resourceNo") String resourceNo, @Param("bizProductType") String bizProductType);
 
 
+    List<CustCtrl> selectByFtype3(@Param("ftype3") String ftype3);
+
+
+    List<CustCtrl> selectByOurBankNm(@Param("ourBankNm") String ourBankNm);
+
+    List<CustCtrl> selectByOurBankAcct(@Param("ourBankAcct") String ourBankAcct);
+
+    List<CustCtrl> selectByPersonDeptNm(@Param("personDeptNm") String personDeptNm);
+
+
 }

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

@@ -30,4 +30,5 @@ public interface DicMapper extends BaseMapper<DataDic> {
 
     List<DataDic> selectByPriceMtd(@Param("priceMtd") String priceMtd);
 
+    List<DataDic> selectByFtyped(@Param("ftype4") String ftype4);
 }

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

@@ -38,4 +38,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> selectByCurcy(@Param("curcy") String curcy);
 
 
+    List<SysUser> selectByCreateBy(@Param("createBy") String createBy);
 }

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

@@ -15,10 +15,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -107,6 +110,9 @@ public class SalesContractServiceImpl implements SalesContractService {
                     if (bizTypeList == null || bizTypeList.isEmpty()) {
                         errors.add("输入的合同类型在数据字典中不存在！");
                     }
+
+                    bizType = bizTypeList.get(0).getItemValue();
+
                     if (StringUtils.isEmpty(entity.getServiceType())) {
                         errors.add("业务类型不能为空！");
                     }
@@ -435,57 +441,120 @@ public class SalesContractServiceImpl implements SalesContractService {
                     }
 
                     List<CustCtrl> curcyList = custCtrlMapper.selectByCurcyPo(entity.getCurcyPo());
-                    if(curcyList ==null||curcyList.isEmpty()){
+                    if (curcyList == null || curcyList.isEmpty()) {
                         errors.add("采购币种有误！");
                     }
 
-                    if(curcyList !=null&&!curcyList.isEmpty()&&!Objects.isNull(curcyList.get(0).getRate())&&!Objects.isNull(entity.getRatePo())){
-                        if(Objects.equals(entity.getRatePo(), curcyList.get(0).getRate())){
+                    if (curcyList != null && !curcyList.isEmpty() && !Objects.isNull(curcyList.get(0).getRate()) && !Objects.isNull(entity.getRatePo())) {
+                        if (Objects.equals(entity.getRatePo(), curcyList.get(0).getRate())) {
                             errors.add("采购汇率和匹配到的采购汇率不符!");
                         }
                     }
 
 
-
-                    if("铁矿石".equals(bizProductType)){
-                        if(Objects.isNull(entity.getIronCont())){
+                    if ("铁矿石".equals(bizProductType)) {
+                        if (Objects.isNull(entity.getIronCont())) {
                             errors.add("合同产品类型为铁矿石时，含铁量%不能为空!");
                         }
                     }
 
-                    if("铁矿石".equals(bizProductType)||"煤炭".equals(bizProductType)){
-                        if(Objects.isNull(entity.getMoisture())){
+                    if ("铁矿石".equals(bizProductType) || "煤炭".equals(bizProductType)) {
+                        if (Objects.isNull(entity.getMoisture())) {
                             errors.add("合同产品类型为铁矿石或煤炭时，水分%不能为空!");
                         }
 
-                        if(StringUtils.isEmpty(entity.getPriceMtd())){
+                        if (StringUtils.isEmpty(entity.getPriceMtd())) {
                             errors.add("合同产品类型为铁矿石或煤炭时，计价方式不能为空！");
                         }
 
-                        List<DataDic> priceMtdList =   dicMapper.selectByPriceMtd(entity.getPriceMtd());
-                        if(priceMtdList==null || priceMtdList.isEmpty()){
+                        List<DataDic> priceMtdList = dicMapper.selectByPriceMtd(entity.getPriceMtd());
+                        if (priceMtdList == null || priceMtdList.isEmpty()) {
                             errors.add("输入的计价方式在数据字典中不存在！");
                         }
-                        if(!StringUtils.isEmpty(entity.getResourceNo())){
-                           List<CustCtrl> resourceNoList =  custCtrlMapper.selectByResourceNo(entity.getResourceNo(),bizProductType);
-                           if(resourceNoList==null || resourceNoList.isEmpty()){
-                               errors.add("资源号有误！");
-                           }
+                        if (!StringUtils.isEmpty(entity.getResourceNo())) {
+                            List<CustCtrl> resourceNoList = custCtrlMapper.selectByResourceNo(entity.getResourceNo(), bizProductType);
+                            if (resourceNoList == null || resourceNoList.isEmpty()) {
+                                errors.add("资源号有误！");
+                            }
                         }
 
                     }
 
-                    if(Objects.isNull(entity.getPoprice())){
+                    if (Objects.isNull(entity.getPoprice())) {
                         errors.add("采购单价不能为空!");
                     }
-                    if(Objects.isNull(entity.getQty())){
+                    if (Objects.isNull(entity.getQty())) {
                         errors.add("数量不能为空!");
                     }
 
+                    if ("出口销售".equals(bizType) || "转口销售".equals(bizType)) {
+                        if (StringUtils.isEmpty(entity.getBatchNo())) {
+                            errors.add("合同类型为出口销售或转口销售时，批次号不能为空！");
+                        }
+                    }
 
+                    if ("钢产品".equals(bizProductType)) {
+                        if (StringUtils.isEmpty(entity.getBrand())) {
+                            errors.add("合同产品类型为钢产品时，牌号不能为空！");
+                        }
+                        List<CustCtrl> itemnoList1 = custCtrlMapper.selectByItemno(entity.getItemno(), bizProductType);
+                        if (itemnoList1 != null && !itemnoList1.isEmpty() && !itemnoList1.get(0).getBrand().isEmpty()) {
 
+                            if (!entity.getBrand().equals(itemnoList1.get(0).getBrand())) {
+                                errors.add("输入的牌号与匹配到的牌号不一致！");
+                            }
+                        }
 
+                        if (StringUtils.isEmpty(entity.getFtype3())) {
+                            errors.add("合同产品类型为钢产品时，规格描述不能为空！");
+                        }
 
+                        List<CustCtrl> ftype3List = custCtrlMapper.selectByFtype3(entity.getFtype3());
+                        if (ftype3List == null || ftype3List.isEmpty()) {
+                            errors.add("输入的规格描述有误！");
+
+                        }
+                        if (ftype3List != null && !ftype3List.isEmpty() && !Objects.isNull(ftype3List.get(0).getFnum4())
+                                && !Objects.isNull(entity.getFnum4())) {
+                            if (!Objects.equals(entity.getFnum4(), ftype3List.get(0).getFnum4())) {
+                                errors.add("输入的米重与匹配到的米重不一致！");
+                            }
+
+                        }
+
+
+                    }
+
+
+                    if (Objects.isNull(entity.getSoPrice())) {
+                        errors.add("销售单价不能为空！");
+                    }
+
+                    if (StringUtils.isEmpty(entity.getItemno()) && (entity.getItemno().contains("0111") ||
+                            entity.getItemno().contains("0113") || entity.getItemno().contains("0116") || entity.getItemno().contains("0117"))) {
+                        if (Objects.isNull(entity.getFnum7())) {
+                            errors.add("商品编号包含0111或0113或0116或0117,长不能为空！");
+                        }
+                    }
+
+                    if (StringUtils.isEmpty(entity.getItemno()) && (
+                            entity.getItemno().contains("0113") || entity.getItemno().contains("0116"))) {
+                        if (Objects.isNull(entity.getFnum4())) {
+                            errors.add("商品编号包含0113或0116,米重不能为空！");
+                        }
+                    }
+
+                    if ("钢产品".equals(bizProductType)) {
+                        if (StringUtils.isEmpty(entity.getFtype4())) {
+                            errors.add("合同产品类型为钢产品时，计重方式不能为空！");
+                        }
+
+                        List<DataDic> ftype4List = dicMapper.selectByFtyped(entity.getFtype4());
+
+                        if (ftype4List == null || ftype4List.isEmpty()) {
+                            errors.add("输入的计重方式在数据字典中不存在");
+                        }
+                    }
 
 
                     salesDtlMapper.insert(entity);
@@ -499,11 +568,74 @@ public class SalesContractServiceImpl implements SalesContractService {
             try {
                 List<SalesCollectExcelDTO> list = ExcelUtils.readSalesCollectSheet(file);
                 if (!list.isEmpty() && cid != null) {
-                    SalesCollectExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
-                    SalesCollectMethodEntity entity = new SalesCollectMethodEntity();
-                    BeanUtils.copyProperties(dto, entity);
-//                    entity.setContractId(cid);
-                    salesCollectMethodMapper.insert(entity);
+                    // 先进行所有校验
+                    Map<String, List<SalesCollectExcelDTO>> groupedByFno = list.stream()
+                            .filter(dto -> !StringUtils.isEmpty(dto.getFno()))
+                            .collect(Collectors.groupingBy(SalesCollectExcelDTO::getFno));
+
+                    // 校验比例总和
+                    for (Map.Entry<String, List<SalesCollectExcelDTO>> entry : groupedByFno.entrySet()) {
+                        String fno = entry.getKey();
+                        List<SalesCollectExcelDTO> sameContractList = entry.getValue();
+
+                        BigDecimal totalRatio = sameContractList.stream()
+                                .map(dto -> dto.getPaymentRatio() != null ? dto.getPaymentRatio() : BigDecimal.ZERO)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                        if (totalRatio.compareTo(new BigDecimal("100")) != 0) {
+                            errors.add("合同号 " + fno + " 的收款比例总和必须为100%，当前总和为：" + totalRatio + "%");
+                        }
+                    }
+
+                    // 校验单个记录
+                    for (SalesCollectExcelDTO entity : list) {
+                        if (StringUtils.isEmpty(entity.getFno())) {
+                            errors.add("销售合同号不能为空!");
+                        }
+
+                        if (StringUtils.isEmpty(entity.getPaymentType())) {
+                            errors.add("款项类别不能为空!");
+                        }
+
+                        if ("预付款-发货后".equals(entity.getPaymentType()) || "发票后结算款".equals(entity.getPaymentType())) {
+                            if (Objects.isNull(entity.getPayDays())) {
+                                errors.add("合同号 " + entity.getFno() + " 的款项类别为'预付款-发货后'或'发票后结算款',账期不能为空！");
+                            }
+                        }
+
+                        if (StringUtils.isEmpty(entity.getPayMode())) {
+                            errors.add("合同号 " + entity.getFno() + " 的收款方式不能为空！");
+                        }
+
+                        if (!StringUtils.isEmpty(entity.getPayMode()) && entity.getPayMode().contains("信用证")) {
+                            if (!"发票后结算款".equals(entity.getPaymentType())) {
+                                errors.add("合同号 " + entity.getFno() + " 的收款方式是信用证类型的，款项类别必须是发票后结算款!");
+                            }
+                        }
+
+                        if (!StringUtils.isEmpty(entity.getOurBankNm())) {
+                            List<CustCtrl> ourBankNmList = custCtrlMapper.selectByOurBankNm(entity.getOurBankNm());
+                            if (ourBankNmList == null || ourBankNmList.isEmpty()) {
+                                errors.add("收款收证银行名称有误！");
+                            }
+                        }
+                        if (!StringUtils.isEmpty(entity.getOurBankAcct())) {
+                            List<CustCtrl> ourBankAcctList = custCtrlMapper.selectByOurBankAcct(entity.getOurBankAcct());
+                            if (ourBankAcctList == null || ourBankAcctList.isEmpty()) {
+                                errors.add("收款收证银行账户有误！");
+                            }
+                        }
+
+                    }
+
+                    // 只有所有校验都通过时才插入所有记录
+                    if (errors.isEmpty()) {
+                        for (SalesCollectExcelDTO dto : list) {
+                            SalesCollectMethodEntity entity = new SalesCollectMethodEntity();
+                            BeanUtils.copyProperties(dto, entity);
+                            salesCollectMethodMapper.insert(entity);
+                        }
+                    }
                 }
             } catch (Exception e) {
                 errors.add("收款计划(Sheet3) 导入失败：" + e.getMessage());
@@ -514,11 +646,124 @@ public class SalesContractServiceImpl implements SalesContractService {
             try {
                 List<RCenterDtlExcelDTO> list = ExcelUtils.readRCenterDtlSheet(file);
                 if (!list.isEmpty() && cid != null) {
-                    RCenterDtlExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
-                    RCenterDtlEntity entity = new RCenterDtlEntity();
-                    BeanUtils.copyProperties(dto, entity);
-//                    entity.setContractId(cid);
-                    rCenterDtlMapper.insert(entity);
+                    // 按合同号分组
+                    Map<String, List<RCenterDtlExcelDTO>> groupedByContract = list.stream()
+                            .filter(dto -> !StringUtils.isEmpty(dto.getFno()))
+                            .collect(Collectors.groupingBy(RCenterDtlExcelDTO::getFno));
+
+                    // 对每个合同号进行校验
+                    for (Map.Entry<String, List<RCenterDtlExcelDTO>> entry : groupedByContract.entrySet()) {
+                        String contractNo = entry.getKey();
+                        List<RCenterDtlExcelDTO> contractList = entry.getValue();
+
+                        // 计算该合同号的利润考核占比总和
+                        BigDecimal totalAssessQtyRate = contractList.stream()
+                                .map(dto -> dto.getAssessQtyRate() != null ? dto.getAssessQtyRate() : BigDecimal.ZERO)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                        // 计算该合同号的金额考核占比总和
+                        BigDecimal totalAssessRatio = contractList.stream()
+                                .map(dto -> dto.getAssessRatio() != null ? dto.getAssessRatio() : BigDecimal.ZERO)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                        // 校验利润考核占比总和是否为100%
+                        if (totalAssessQtyRate.compareTo(new BigDecimal("100")) != 0) {
+                            errors.add("合同号 " + contractNo + " 的利润考核占比总和必须为100%，当前总和为：" + totalAssessQtyRate + "%");
+                        }
+
+                        // 校验金额考核占比总和是否为100%
+                        if (totalAssessRatio.compareTo(new BigDecimal("100")) != 0) {
+                            errors.add("合同号 " + contractNo + " 的金额考核占比总和必须为100%，当前总和为：" + totalAssessRatio + "%");
+                        }
+                    }
+
+                    for (RCenterDtlExcelDTO dto : list) {
+                        if (StringUtils.isEmpty(dto.getFno())){
+                            errors.add("销售合同号不能为空!");
+                        }
+                        if(StringUtils.isEmpty(dto.getPersonDeptNm())){
+                            errors.add("部门名称不能为空！");
+                        }
+                        List<CustCtrl> personDeptNmList = custCtrlMapper.selectByPersonDeptNm(dto.getPersonDeptNm());
+                        if(personDeptNmList == null || personDeptNmList.isEmpty()){
+                            errors.add("部门名称有误！");
+                        }
+
+                        if(personDeptNmList!=null&&!personDeptNmList.isEmpty()&& personDeptNmList.get(0).getDeptCdoe().isEmpty()){
+                            errors.add("匹配到的部门编码为空");
+                        }
+
+                        if(personDeptNmList!=null&&!personDeptNmList.isEmpty()&& !personDeptNmList.get(0).getDeptCdoe().isEmpty()){
+                            dto.setPersonDeptId(personDeptNmList.get(0).getDeptCdoe());
+                        }
+
+                        if(personDeptNmList!=null&&!personDeptNmList.isEmpty()&&StringUtils.isEmpty(dto.getInstitutionNm())
+                                && !personDeptNmList.get(0).getCpny().isEmpty()){
+                            if(dto.getInstitutionNm().equals(personDeptNmList.get(0).getCpny())){
+                                errors.add("公司名称与匹配到的公司名称不一致！");
+                            }
+                        }
+
+                        if(personDeptNmList!=null&&!personDeptNmList.isEmpty()&&StringUtils.isEmpty(dto.getInstitutionId())
+                                && !personDeptNmList.get(0).getFno().isEmpty()){
+                            if(dto.getInstitutionId().equals(personDeptNmList.get(0).getFno())){
+                                errors.add("公司代码与匹配到的公司代码不一致！");
+                            }
+                        }
+
+                        if(!StringUtils.isEmpty(dto.getCreateBy())){
+                            List<SysUser> createByList = sysUserMapper.selectByCreateBy(dto.getCreateBy());
+                            if(createByList==null || createByList.isEmpty()){
+                                errors.add("制单人代码有误！");
+                            }
+
+                            if(createByList!=null && !createByList.isEmpty()&&createByList.get(0).getDeptCode().isEmpty()){
+                                errors.add("制单人代码查到的制单人部门编码为空！");
+                            }
+
+                            if(createByList!=null && !createByList.isEmpty()&&!createByList.get(0).getDeptCode().isEmpty()){
+                                dto.setDeptId(createByList.get(0).getDeptCode());
+                            }
+
+                            if(createByList!=null && !createByList.isEmpty()&&createByList.get(0).getDeptName().isEmpty()){
+                                errors.add("制单人代码查到的制单人部门名称为空！");
+                            }
+                            if(createByList!=null && !createByList.isEmpty()&&!createByList.get(0).getDeptName().isEmpty()){
+                                dto.setDeptName(createByList.get(0).getDeptName());
+
+                            }
+                            if(createByList!=null && !createByList.isEmpty()&&!createByList.get(0).getUserDesc().isEmpty()){
+                                dto.setCreateByName(createByList.get(0).getUserDesc());
+
+                            }
+
+
+                        }
+
+
+
+                    }
+
+                    // 只有所有校验都通过时才插入所有记录
+                    if (errors.isEmpty()) {
+                        for (RCenterDtlExcelDTO dto : list) {
+                            RCenterDtlEntity entity = new RCenterDtlEntity();
+                            BeanUtils.copyProperties(dto, entity);
+                            rCenterDtlMapper.insert(entity);
+                        }
+                    }
+
+
+                    // 如果有错误，不执行插入操作
+                    if (errors.isEmpty()) {
+                        // 循环插入所有记录
+                        for (RCenterDtlExcelDTO dto : list) {
+                            RCenterDtlEntity entity = new RCenterDtlEntity();
+                            BeanUtils.copyProperties(dto, entity);
+                            // entity.setContractId(cid);
+                            rCenterDtlMapper.insert(entity);
+                        }
+                    }
                 }
             } catch (Exception e) {
                 errors.add("责任中心(Sheet4) 导入失败：" + e.getMessage());

src/main/resources/mapper/CustCtrlMapper.xml

@@ -63,7 +63,8 @@
         a.hsCode,
         a.hsNameCn,
         a.hsNameEn,
-        a.inTaxRate
+        a.inTaxRate,
+        a.brand
         from SGGMIIP.invitem a
         left join (select fno, type_name type_name2
         from SGGMIIP.product_category
@@ -103,4 +104,44 @@
         and a.fno =#{resourceNo}
         order by a.fdate desc,a.fno
     </select>
+    <select id="selectByFtype3" resultType="com.example.backend.entity.common.CustCtrl">
+        select steelProductSpecNo,steelProductSpecularity,fnum4
+        from SGGMIIP.steelProductSpec
+        where ifnull(del_flag, 0) != 1
+        and steelProductSpecularity =#{ftype3}
+    </select>
+    <select id="selectByOurBankNm" resultType="com.example.backend.entity.common.CustCtrl">
+        select a.bankNm,a.bankAcct
+        from SGGMIIP.custbank a
+        left join SGGMIIP.addrctrl b on a.rid = b.id
+        where ifnull(a.del_flag, 0) != 1
+        and a.stopBank='否'
+        and a.bankNm =#{ourBankNm}
+    </select>
+    <select id="selectByOurBankAcct" resultType="com.example.backend.entity.common.CustCtrl">
+        select a.bankNm,a.bankAcct
+        from SGGMIIP.custbank a
+                 left join SGGMIIP.addrctrl b on a.rid = b.id
+        where ifnull(a.del_flag, 0) != 1
+          and a.stopBank='否'
+          and a.bankNm =#{ourBankAcct}
+    </select>
+    <select id="selectByPersonDeptNm" resultType="com.example.backend.entity.common.CustCtrl">
+        SELECT
+            t.fno,
+            t.cpny,
+            t.deptname,
+            t.deptcode
+        FROM (
+                 SELECT DISTINCT
+                     c.fno,
+                     c.cpny,
+                     a.deptname,
+                     a.deptcode
+                 FROM SGGMIIP.View_Dept_Code a
+                          LEFT JOIN SGGMIIP.View_User_Code b ON a.deptid = b.dept_id
+                          LEFT JOIN SGGMIIP.addrctrl c ON a.fourscode = c.hrDeptCode
+             ) t
+        where t.deptname =#{personDeptNm}
+    </select>
 </mapper>

src/main/resources/mapper/DicMapper.xml

@@ -48,4 +48,13 @@
           and i.status = '0'
           and d.status = '0'
     </select>
+    <select id="selectByFtyped" resultType="com.example.backend.entity.common.DataDic">
+        select d.dic_name, i.item_value
+        from SGGMIIP.data_dic d
+                 left join SGGMIIP.data_item i on d.id = i.dic_id
+        where i.item_value = #{ftype4}
+          and d.dic_name = '计重方式'
+          and i.status = '0'
+          and d.status = '0'
+    </select>
 </mapper>

src/main/resources/mapper/SysUserMapper.xml

@@ -34,4 +34,14 @@
         and a.ctCnNm = #{ctName}
         order by a.fno
     </select>
+    <select id="selectByCreateBy" resultType="com.example.backend.entity.common.SysUser">
+        select a.DEPT_CODE, 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
+        where c.USER_CODE = #{createBy}
+          and a.cancel_flag = '0'
+          and b.cancel_flag = '0'
+          and c.cancel_flag = '0'
+    </select>
 </mapper>