|
|
@ -490,7 +490,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
|
|
|
|
model.setOrgnizeId(listuser.get(0).getOrganizeId());
|
|
|
|
model.setOrgnizeId(listuser.get(0).getOrganizeId());
|
|
|
|
model.setDepartmentId(listuser.get(0).getDepartmentId());
|
|
|
|
model.setDepartmentId(listuser.get(0).getDepartmentId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
|
|
|
|
model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
|
|
|
|
if (model.getName() != null) {
|
|
|
|
if (model.getName() != null) {
|
|
|
|
LambdaQueryWrapper<CustomerEntity> wrapper1 = new LambdaQueryWrapper<>();
|
|
|
|
LambdaQueryWrapper<CustomerEntity> wrapper1 = new LambdaQueryWrapper<>();
|
|
|
|
wrapper1.eq(CustomerEntity::getSupplierNm, model.getName())
|
|
|
|
wrapper1.eq(CustomerEntity::getSupplierNm, model.getName())
|
|
|
@ -504,19 +504,18 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
|
|
|
|
|
|
|
|
|
|
|
|
if (CustomerEntitys != null && CustomerEntitys.size() > 0 ) {
|
|
|
|
if (CustomerEntitys != null && CustomerEntitys.size() > 0 ) {
|
|
|
|
if (model.getContractType() != null) {
|
|
|
|
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");
|
|
|
|
model.setContractType("1");
|
|
|
|
|
|
|
|
|
|
|
|
if (model.getName() != null) {
|
|
|
|
if (model.getName() != null) {
|
|
|
@ -563,20 +562,19 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
|
|
|
|
model.setCode(list.get(0).getId());
|
|
|
|
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() != null) {
|
|
|
|
if (model.getClassification().equals("采购类")) {
|
|
|
|
if (model.getClassification().equals("采购类")) {
|
|
|
|