合同新增过滤和新增拦截

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java

@@ -23,6 +23,7 @@ import jnpf.constant.MsgCode;
 import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.contractfile.entity.Contract_item0Entity;
 import jnpf.contractfile.entity.Contract_item1Entity;
+import jnpf.contractfile.mapper.ContractFileMapper;
 import jnpf.contractfile.model.contractfile.*;
 import jnpf.contractfile.service.ContractFileService;
 import jnpf.contractfile.service.Contract_item0Service;
@@ -55,8 +56,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * contractFile
@@ -91,6 +94,9 @@ public class ContractFileController {
     @Autowired
     private YozoUtils yozoUtils;
 
+    @Autowired
+    private ContractFileMapper contractFileMapper;
+
 
     /**
      * 采购合同列表
@@ -306,8 +312,38 @@ public class ContractFileController {
                 return ActionResult.fail("合同导入对方合同号是必填项");
             }
         }
+        List<ContractFileModel> contractFileModelList = new ArrayList<>();
+        List<ContractFileModel> duplicates = dataList.stream().distinct().collect(Collectors.toList());
+        System.out.println("重复数据：" + duplicates);
+        for (ContractFileModel contractFileModel:duplicates){
+            QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper
+                    .eq("contract_name", contractFileModel.getContractName())
+                    .eq("contract_code", contractFileModel.getContractCode())
+                    .eq("name", contractFileModel.getName())
+                    .eq("orgnize_id", contractFileModel.getOrgnizeId())
+                    .eq("department_id", contractFileModel.getDepartmentId())
+                    .eq("contract_no",contractFileModel.getContractNo());
+            List<ContractFileEntity> list = contractFileMapper.selectList(queryWrapper);
+            Map<String, Object> map = new HashMap<>();
+            map.put("contractName", contractFileModel.getContractName());
+            map.put("contractCode", contractFileModel.getContractCode());
+            map.put("name", contractFileModel.getName());
+            map.put("orgnizeId", contractFileModel.getOrgnizeId());
+            map.put("departmentId", contractFileModel.getDepartmentId());
+            map.put("contractNo", contractFileModel.getContractNo());
+            List<ContractFileEntity> list1 = contractFileMapper.queryContractFileEntityByImport(map);
+            if (list1.size() > 0){
+                System.out.println(list1);
+            }else if (list.size() > 0){
+                System.out.println(list);
+            }else {
+                contractFileModelList=duplicates;
+            }
+
+        }
         //导入数据
-        ContractfileImportVO result = contractFileService.importData(dataList);
+        ContractfileImportVO result = contractFileService.importData(contractFileModelList);
         return ActionResult.success(result);
     }
 

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -490,7 +490,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                 model.setOrgnizeId(listuser.get(0).getOrganizeId());
                 model.setDepartmentId(listuser.get(0).getDepartmentId());
             }
-                model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
+            model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
             if (model.getName() != null) {
                 LambdaQueryWrapper<CustomerEntity> wrapper1 = new LambdaQueryWrapper<>();
                 wrapper1.eq(CustomerEntity::getSupplierNm, model.getName())
@@ -504,19 +504,18 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
 
                 if (CustomerEntitys != null && CustomerEntitys.size() > 0 ) {
                     if (model.getContractType() != null) {
-//                        if (model.getContractType().equals("采购合同")) {
+                        if (model.getContractType().equals("采购合同")) {
-//                            model.setContractType("0");
+                            model.setContractType("0");
-//                            if (model.getName() != null) {
+                            if (model.getName() != null) {
-//                                QueryWrapper<SupplierEntity> queryWrappers = new QueryWrapper<SupplierEntity>();
+                                QueryWrapper<SupplierEntity> queryWrappers = new QueryWrapper<SupplierEntity>();
-//                                queryWrappers.eq("supplier_name", model.getName())
+                                queryWrappers.eq("supplier_name", model.getName())
-//                                        .eq("department_id",detpartment);
+                                        .eq("department_id",detpartment);
-//                                List<SupplierEntity> list = supplierMapper.selectList(queryWrappers);
+                                List<SupplierEntity> list = supplierMapper.selectList(queryWrappers);
-//                                if (list.size() > 0) {
+                                if (list.size() > 0) {
-//                                    model.setCode(list.get(0).getId());
+                                    model.setCode(list.get(0).getId());
-//                                }
+                                }
-//                            }
+                            }
-//                        } else
+                        } else if (model.getContractType().equals("销售合同")) {
-                            if (model.getContractType().equals("销售合同")) {
                             model.setContractType("1");
 
                             if (model.getName() != null) {
@@ -563,20 +562,19 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                                     model.setCode(list.get(0).getId());
                                 }
                             }
+                        } else if (model.getContractType().equals("销售合同")) {
+                            model.setContractType("1");
+
+                            if (model.getName() != null) {
+                                QueryWrapper<CustomerEntity> queryWrappers = new QueryWrapper<CustomerEntity>();
+                                queryWrappers.eq("supplier_nm", model.getName())
+                                        .eq("orgnize_id",orgnize);
+                                List<CustomerEntity> list = customerMapper.selectList(queryWrappers);
+                                if (list.size() > 0) {
+                                    model.setCode(list.get(0).getId());
+                                }
+                            }
                         }
-//                        else if (model.getContractType().equals("销售合同")) {
-//                            model.setContractType("1");
-//
-//                            if (model.getName() != null) {
-//                                QueryWrapper<CustomerEntity> queryWrappers = new QueryWrapper<CustomerEntity>();
-//                                queryWrappers.eq("supplier_nm", model.getName())
-//                                        .eq("orgnize_id",orgnize);
-//                                List<CustomerEntity> list = customerMapper.selectList(queryWrappers);
-//                                if (list.size() > 0) {
-//                                    model.setCode(list.get(0).getId());
-//                                }
-//                            }
-//                        }
                     }
                     if (model.getClassification() != null) {
                         if (model.getClassification().equals("采购类")) {