优化开票文件 车辆新增手机号空格 付款下载公司问题

main
tengxi 1 year ago
parent 895f4e2233
commit 2feee71047

@ -55,7 +55,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
*
* paymentdoc * paymentdoc
* V3.2.0 * V3.2.0
* LINKAGE-BOOT * LINKAGE-BOOT
@ -88,124 +87,123 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
private PaymentdocMapper paymentdocMapper; private PaymentdocMapper paymentdocMapper;
@Override @Override
public List<PaymentdocEntity> getList(PaymentdocPagination paymentdocPagination){ public List<PaymentdocEntity> getList(PaymentdocPagination paymentdocPagination) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
int total=0; int total = 0;
int paymentdocNum =0; int paymentdocNum = 0;
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper = new QueryWrapper<>();
int paymentdocItem0Num =0; int paymentdocItem0Num = 0;
QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper = new QueryWrapper<>();
int paymentdocItem1Num =0; int paymentdocItem1Num = 0;
QueryWrapper<PaymentdocItem1Entity> paymentdocItem1QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem1Entity> paymentdocItem1QueryWrapper = new QueryWrapper<>();
int paymentdocItem2Num =0; int paymentdocItem2Num = 0;
QueryWrapper<PaymentdocItem2Entity> paymentdocItem2QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem2Entity> paymentdocItem2QueryWrapper = new QueryWrapper<>();
boolean pcPermission = true; boolean pcPermission = true;
boolean appPermission = true; boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); Object paymentdocObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>) paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item0")); Object paymentdocItem0Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>)paymentdocItem0Obj; paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>) paymentdocItem0Obj;
paymentdocItem0Num++; paymentdocItem0Num++;
} }
Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item1")); Object paymentdocItem1Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item1"));
if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ if (ObjectUtil.isEmpty(paymentdocItem1Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>)paymentdocItem1Obj; paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>) paymentdocItem1Obj;
paymentdocItem1Num++; paymentdocItem1Num++;
} }
Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item2")); Object paymentdocItem2Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item2"));
if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ if (ObjectUtil.isEmpty(paymentdocItem2Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>)paymentdocItem2Obj; paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>) paymentdocItem2Obj;
paymentdocItem2Num++; paymentdocItem2Num++;
} }
} }
} }
if(!isPc && appPermission){ if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); Object paymentdocObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>) paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item0")); Object paymentdocItem0Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>)paymentdocItem0Obj; paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>) paymentdocItem0Obj;
paymentdocItem0Num++; paymentdocItem0Num++;
} }
Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item1")); Object paymentdocItem1Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item1"));
if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ if (ObjectUtil.isEmpty(paymentdocItem1Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>)paymentdocItem1Obj; paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>) paymentdocItem1Obj;
paymentdocItem1Num++; paymentdocItem1Num++;
} }
Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item2")); Object paymentdocItem2Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item2"));
if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ if (ObjectUtil.isEmpty(paymentdocItem2Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>)paymentdocItem2Obj; paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>) paymentdocItem2Obj;
paymentdocItem2Num++; paymentdocItem2Num++;
} }
} }
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getDocumentNo())){ if (StringUtil.isNotEmpty(paymentdocPagination.getDocumentNo())) {
paymentdocNum++; paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo,paymentdocPagination.getDocumentNo()); paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo, paymentdocPagination.getDocumentNo());
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getRamount())){ if (StringUtil.isNotEmpty(paymentdocPagination.getRamount())) {
paymentdocNum++; paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getRamount,paymentdocPagination.getRamount()); paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getRamount, paymentdocPagination.getRamount());
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getNum())){ if (StringUtil.isNotEmpty(paymentdocPagination.getNum())) {
paymentdocNum++; paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getNum,paymentdocPagination.getNum()); paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getNum, paymentdocPagination.getNum());
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getCreatorUserName())){ if (StringUtil.isNotEmpty(paymentdocPagination.getCreatorUserName())) {
paymentdocNum++; paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getCreatorUserName,paymentdocPagination.getCreatorUserName()); paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getCreatorUserName, paymentdocPagination.getCreatorUserName());
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getSupplierName())){ if (StringUtil.isNotEmpty(paymentdocPagination.getSupplierName())) {
QueryWrapper<SupplierEntity> customerQueryWrapper =new QueryWrapper<>(); QueryWrapper<SupplierEntity> customerQueryWrapper = new QueryWrapper<>();
customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName()); customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName());
customerQueryWrapper.lambda().select(SupplierEntity::getId); customerQueryWrapper.lambda().select(SupplierEntity::getId);
List<String> customerIdList = supplierService.listObjs(customerQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); List<String> customerIdList = supplierService.listObjs(customerQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
paymentdocNum++; paymentdocNum++;
if(customerIdList.size() > 0){ if (customerIdList.size() > 0) {
paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getSupplierId,customerIdList); paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getSupplierId, customerIdList);
}else{ } else {
paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getSupplierId, paymentdocPagination.getSupplierName()); paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getSupplierId, paymentdocPagination.getSupplierName());
} }
} }
if(AllIdList.size()>0){ if (AllIdList.size() > 0) {
paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList); paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList);
} }
//排序 //排序
if(StringUtil.isEmpty(paymentdocPagination.getSidx())){ if (StringUtil.isEmpty(paymentdocPagination.getSidx())) {
paymentdocQueryWrapper.lambda().orderByDesc(PaymentdocEntity::getId); paymentdocQueryWrapper.lambda().orderByDesc(PaymentdocEntity::getId);
}else{ } else {
try { try {
String sidx = paymentdocPagination.getSidx(); String sidx = paymentdocPagination.getSidx();
PaymentdocEntity paymentdocEntity = new PaymentdocEntity(); PaymentdocEntity paymentdocEntity = new PaymentdocEntity();
@ -213,175 +211,180 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
paymentdocPagination.setSidx(value); paymentdocPagination.setSidx(value);
paymentdocQueryWrapper="asc".equals(paymentdocPagination.getSort().toLowerCase())?paymentdocQueryWrapper.orderByAsc(value):paymentdocQueryWrapper.orderByDesc(value); paymentdocQueryWrapper = "asc".equals(paymentdocPagination.getSort().toLowerCase()) ? paymentdocQueryWrapper.orderByAsc(value) : paymentdocQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<PaymentdocEntity> page=new Page<>(paymentdocPagination.getCurrentPage(), paymentdocPagination.getPageSize()); Page<PaymentdocEntity> page = new Page<>(paymentdocPagination.getCurrentPage(), paymentdocPagination.getPageSize());
IPage<PaymentdocEntity> userIPage=this.page(page, paymentdocQueryWrapper); IPage<PaymentdocEntity> userIPage = this.page(page, paymentdocQueryWrapper);
return paymentdocPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return paymentdocPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<PaymentdocEntity> list = new ArrayList(); List<PaymentdocEntity> list = new ArrayList();
return paymentdocPagination.setData(list, list.size()); return paymentdocPagination.setData(list, list.size());
} }
} }
@Override @Override
public List<PaymentdocEntity> getTypeList(PaymentdocPagination paymentdocPagination,String dataType){ public List<PaymentdocEntity> getTypeList(PaymentdocPagination paymentdocPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
int total=0; int total = 0;
int paymentdocNum =0; int paymentdocNum = 0;
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper = new QueryWrapper<>();
int paymentdocItem0Num =0; int paymentdocItem0Num = 0;
QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper = new QueryWrapper<>();
int paymentdocItem1Num =0; int paymentdocItem1Num = 0;
QueryWrapper<PaymentdocItem1Entity> paymentdocItem1QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem1Entity> paymentdocItem1QueryWrapper = new QueryWrapper<>();
int paymentdocItem2Num =0; int paymentdocItem2Num = 0;
QueryWrapper<PaymentdocItem2Entity> paymentdocItem2QueryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocItem2Entity> paymentdocItem2QueryWrapper = new QueryWrapper<>();
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); Object paymentdocObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>) paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item0")); Object paymentdocItem0Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>)paymentdocItem0Obj; paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>) paymentdocItem0Obj;
paymentdocItem0Num++; paymentdocItem0Num++;
} }
Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item1")); Object paymentdocItem1Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item1"));
if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ if (ObjectUtil.isEmpty(paymentdocItem1Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>)paymentdocItem1Obj; paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>) paymentdocItem1Obj;
paymentdocItem1Num++; paymentdocItem1Num++;
} }
Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item2")); Object paymentdocItem2Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item2"));
if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ if (ObjectUtil.isEmpty(paymentdocItem2Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>)paymentdocItem2Obj; paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>) paymentdocItem2Obj;
paymentdocItem2Num++; paymentdocItem2Num++;
} }
} }
} }
if(!isPc && appPermission){ if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc")); Object paymentdocObj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){ if (ObjectUtil.isEmpty(paymentdocObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj; paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>) paymentdocObj;
paymentdocNum++; paymentdocNum++;
} }
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item0")); Object paymentdocItem0Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){ if (ObjectUtil.isEmpty(paymentdocItem0Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>)paymentdocItem0Obj; paymentdocItem0QueryWrapper = (QueryWrapper<PaymentdocItem0Entity>) paymentdocItem0Obj;
paymentdocItem0Num++; paymentdocItem0Num++;
} }
Object paymentdocItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item1")); Object paymentdocItem1Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem1QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item1"));
if (ObjectUtil.isEmpty(paymentdocItem1Obj)){ if (ObjectUtil.isEmpty(paymentdocItem1Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>)paymentdocItem1Obj; paymentdocItem1QueryWrapper = (QueryWrapper<PaymentdocItem1Entity>) paymentdocItem1Obj;
paymentdocItem1Num++; paymentdocItem1Num++;
} }
Object paymentdocItem2Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc_item2")); Object paymentdocItem2Obj = authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem2QueryWrapper, paymentdocPagination.getMenuId(), "jg_paymentdoc_item2"));
if (ObjectUtil.isEmpty(paymentdocItem2Obj)){ if (ObjectUtil.isEmpty(paymentdocItem2Obj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>)paymentdocItem2Obj; paymentdocItem2QueryWrapper = (QueryWrapper<PaymentdocItem2Entity>) paymentdocItem2Obj;
paymentdocItem2Num++; paymentdocItem2Num++;
} }
} }
} }
if(StringUtil.isNotEmpty(paymentdocPagination.getDocumentNo())){ if (StringUtil.isNotEmpty(paymentdocPagination.getDocumentNo())) {
paymentdocNum++; paymentdocNum++;
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo,paymentdocPagination.getDocumentNo()); paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo, paymentdocPagination.getDocumentNo());
} }
if(AllIdList.size()>0){ if (AllIdList.size() > 0) {
paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList); paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList);
} }
//排序 //排序
if(StringUtil.isEmpty(paymentdocPagination.getSidx())){ if (StringUtil.isEmpty(paymentdocPagination.getSidx())) {
paymentdocQueryWrapper.lambda().orderByDesc(PaymentdocEntity::getId); paymentdocQueryWrapper.lambda().orderByDesc(PaymentdocEntity::getId);
}else{ } else {
try { try {
String sidx = paymentdocPagination.getSidx(); String sidx = paymentdocPagination.getSidx();
PaymentdocEntity paymentdocEntity = new PaymentdocEntity(); PaymentdocEntity paymentdocEntity = new PaymentdocEntity();
Field declaredField = paymentdocEntity.getClass().getDeclaredField(sidx); Field declaredField = paymentdocEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
paymentdocQueryWrapper="asc".equals(paymentdocPagination.getSort().toLowerCase())?paymentdocQueryWrapper.orderByAsc(value):paymentdocQueryWrapper.orderByDesc(value); paymentdocQueryWrapper = "asc".equals(paymentdocPagination.getSort().toLowerCase()) ? paymentdocQueryWrapper.orderByAsc(value) : paymentdocQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<PaymentdocEntity> page=new Page<>(paymentdocPagination.getCurrentPage(), paymentdocPagination.getPageSize()); Page<PaymentdocEntity> page = new Page<>(paymentdocPagination.getCurrentPage(), paymentdocPagination.getPageSize());
IPage<PaymentdocEntity> userIPage=this.page(page, paymentdocQueryWrapper); IPage<PaymentdocEntity> userIPage = this.page(page, paymentdocQueryWrapper);
return paymentdocPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return paymentdocPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<PaymentdocEntity> list = new ArrayList(); List<PaymentdocEntity> list = new ArrayList();
return paymentdocPagination.setData(list, list.size()); return paymentdocPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(paymentdocQueryWrapper); return this.list(paymentdocQueryWrapper);
} }
} }
@Override @Override
public PaymentdocEntity getInfo(String id){ public PaymentdocEntity getInfo(String id) {
QueryWrapper<PaymentdocEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<PaymentdocEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentdocEntity::getId,id); queryWrapper.lambda().eq(PaymentdocEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(PaymentdocEntity entity){ public void create(PaymentdocEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, PaymentdocEntity entity){ public boolean update(String id, PaymentdocEntity entity) {
entity.setId(id); entity.setId(id);
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(PaymentdocEntity entity){ public void delete(PaymentdocEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
//子表方法 //子表方法
@Override @Override
public List<PaymentdocItem0Entity> GetPaymentdocItem0List(String id){ public List<PaymentdocItem0Entity> GetPaymentdocItem0List(String id) {
QueryWrapper<PaymentdocItem0Entity> queryWrapper = new QueryWrapper<>(); QueryWrapper<PaymentdocItem0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentdocItem0Entity::getPaymentdocId, id); queryWrapper.lambda().eq(PaymentdocItem0Entity::getPaymentdocId, id);
return paymentdocItem0Service.list(queryWrapper); return paymentdocItem0Service.list(queryWrapper);
} }
@Override @Override
public List<PaymentdocItem1Entity> GetPaymentdocItem1List(String id){ public List<PaymentdocItem1Entity> GetPaymentdocItem1List(String id) {
QueryWrapper<PaymentdocItem1Entity> queryWrapper = new QueryWrapper<>(); QueryWrapper<PaymentdocItem1Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, id); queryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, id);
return paymentdocItem1Service.list(queryWrapper); return paymentdocItem1Service.list(queryWrapper);
} }
@Override @Override
public List<PaymentdocItem2Entity> GetPaymentdocItem2List(String id){ public List<PaymentdocItem2Entity> GetPaymentdocItem2List(String id) {
QueryWrapper<PaymentdocItem2Entity> queryWrapper = new QueryWrapper<>(); QueryWrapper<PaymentdocItem2Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentdocItem2Entity::getPaymentdocId, id); queryWrapper.lambda().eq(PaymentdocItem2Entity::getPaymentdocId, id);
return paymentdocItem2Service.list(queryWrapper); return paymentdocItem2Service.list(queryWrapper);
@ -399,12 +402,12 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
private UserRelationService userRelationService; private UserRelationService userRelationService;
@Override @Override
public void getPaymentDocPdf(String id,String token) throws IOException { public void getPaymentDocPdf(String id, String token) throws IOException {
List<PaymentdocItem2Entity> item2Entities = this.GetPaymentdocItem2List(id); List<PaymentdocItem2Entity> item2Entities = this.GetPaymentdocItem2List(id);
List<Map<String, Object>> paymentDocNodeInfo = paymentdocMapper.getPaymentDocNodeInfo(id); List<Map<String, Object>> paymentDocNodeInfo = paymentdocMapper.getPaymentDocNodeInfo(id);
List<PaymentdocMessage> paymentDocMessage = paymentdocMapper.getPaymentDocMessage(id); List<PaymentdocMessage> paymentDocMessage = paymentdocMapper.getPaymentDocMessage(id);
PaymentdocMessage paymentdocMessage = null; PaymentdocMessage paymentdocMessage = null;
if (paymentDocMessage!=null&&paymentDocMessage.size()>0){ if (paymentDocMessage != null && paymentDocMessage.size() > 0) {
paymentdocMessage = paymentDocMessage.get(0); paymentdocMessage = paymentDocMessage.get(0);
} }
// String id1=userProvider.get().getUserId(); // String id1=userProvider.get().getUserId();
@ -413,71 +416,82 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
UserInfo userInfo = userProvider.get(token); UserInfo userInfo = userProvider.get(token);
String id1 = userInfo.getUserId(); String id1 = userInfo.getUserId();
// String id1 = userProvider.get().getId(); // String id1 = userProvider.get().getId();
if (id1!=null){ if (id1 != null) {
QueryWrapper<UserEntity> userEntityQueryWrapper = new QueryWrapper<>(); QueryWrapper<UserEntity> userEntityQueryWrapper = new QueryWrapper<>();
userEntityQueryWrapper.lambda().eq(UserEntity::getId,id1); userEntityQueryWrapper.lambda().eq(UserEntity::getId, id1);
List<UserEntity> userEntities = userMapper.selectList(userEntityQueryWrapper); List<UserEntity> userEntities = userMapper.selectList(userEntityQueryWrapper);
UserEntity userEntity = userEntities.get(0); UserEntity userEntity = userEntities.get(0);
paymentdocMessage.setRealName(userEntity.getRealName());//姓名 paymentdocMessage.setRealName(userEntity.getRealName());//姓名
paymentdocMessage.setMobilePhone(userEntity.getMobilePhone());//手机号 paymentdocMessage.setMobilePhone(userEntity.getMobilePhone());//手机号
paymentdocMessage.setNowTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));//时间 paymentdocMessage.setNowTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));//时间
// 获取组织 // 获取组织
if(StringUtil.isNotNull(userEntity.getOrganizeId())){ if (StringUtil.isNotNull(userEntity.getOrganizeId())) {
// paymentdocMessage.setFullName(PermissionUtil.getLinkInfoByOrgId(userEntity.getOrganizeId(), organizeService, false)); // paymentdocMessage.setFullName(PermissionUtil.getLinkInfoByOrgId(userEntity.getOrganizeId(), organizeService, false));
paymentdocMessage.setFullName(userRelationService.getObjectVoList(PermissionConst.ORGANIZE,userEntity).get(0).getFullName()); paymentdocMessage.setFullName(userRelationService.getObjectVoList(PermissionConst.ORGANIZE, userEntity).get(0).getFullName());
} }
log.warn("这是组织"+paymentdocMessage.getFullName()); log.warn("这是组织" + paymentdocMessage.getFullName());
} }
String substring = null; String substring = null;
String substring1 = null; String substring1 = null;
if (paymentdocMessage.getFullName()!=null){//拟稿单位不为空 if (paymentdocMessage.getFullName() != null) {//拟稿单位不为空
String fullName = paymentdocMessage.getFullName(); String fullName = paymentdocMessage.getFullName();
if (fullName.indexOf("/", fullName.indexOf("/")+1)!=-1){ if (fullName.indexOf("/", fullName.indexOf("/") + 1) != -1) {
substring = fullName.substring(fullName.indexOf("/")+1, fullName.indexOf("/", fullName.indexOf("/")+1)); substring = fullName.substring(fullName.indexOf("/") + 1, fullName.indexOf("/", fullName.indexOf("/") + 1));
if (fullName.length()>fullName.indexOf(substring)+2){ if (fullName.length() > fullName.indexOf(substring) + 2) {
substring1 = fullName.substring(fullName.indexOf(substring) + substring.length()+1, fullName.length()); substring1 = fullName.substring(fullName.indexOf(substring) + substring.length() + 1, fullName.length());
} }
while (substring1.contains("公司")){ while (substring1.contains("公司")) {
if (!substring1.contains("/")){ if (!substring1.contains("/")) {
break; break;
} }
substring=substring1.substring(0,substring1.indexOf("/")); substring = substring1.substring(0, substring1.indexOf("/"));
substring1=substring1.substring(substring1.indexOf("/")+1,substring1.length()); substring1 = substring1.substring(substring1.indexOf("/") + 1, substring1.length());
} }
while (true){ // while (true){
// int intNum = StringUtils.countMatches(paymentdocMessage.getFullName(), "公司");
// if (intNum>1){
// paymentdocMessage.setFullName(fullName.substring(fullName.IndexOf("公司")+3,fullName.length()));
// }else {
// break;
// }
// }
try { //pdf拟稿单位。截取后面的单位
paymentdocMessage.setFullName(substring + "/" + substring1); //拼接后面的两个单位名称
} catch (Exception e) {
while (true) {
int intNum = StringUtils.countMatches(paymentdocMessage.getFullName(), "公司"); int intNum = StringUtils.countMatches(paymentdocMessage.getFullName(), "公司");
if (intNum>1){ if (intNum > 1) {
paymentdocMessage.setFullName(fullName.substring(fullName.indexOf("公司")+3,fullName.length())); paymentdocMessage.setFullName(fullName.substring(fullName.lastIndexOf("公司") + 3, fullName.length()));
}else { } else {
break; break;
} }
} }
}else {
substring=fullName.substring(fullName.indexOf("/")+1,fullName.length());
substring1="再生资源事业部";
} }
} else {
substring = fullName.substring(fullName.indexOf("/") + 1, fullName.length());
substring1 = "再生资源事业部";
} }
}
StringBuilder payEnclosureStr = new StringBuilder(); StringBuilder payEnclosureStr = new StringBuilder();
if (paymentdocMessage.getEnclosure()!=null){//附件不为空 if (paymentdocMessage.getEnclosure() != null) {//附件不为空
String enclosure = paymentdocMessage.getEnclosure(); String enclosure = paymentdocMessage.getEnclosure();
JSONArray jsonToJsonArray = JsonUtil.getJsonToJsonArray(enclosure); JSONArray jsonToJsonArray = JsonUtil.getJsonToJsonArray(enclosure);
for (int i = 0; i < jsonToJsonArray.size(); i++) { for (int i = 0; i < jsonToJsonArray.size(); i++) {
Map o = (Map)jsonToJsonArray.get(i); Map o = (Map) jsonToJsonArray.get(i);
Object name = o.get("name"); Object name = o.get("name");
if (i==0){ if (i == 0) {
payEnclosureStr.append(name); payEnclosureStr.append(name);
}else { } else {
payEnclosureStr.append("<br/>"+name); payEnclosureStr.append("<br/>" + name);
} }
} }
@ -487,8 +501,8 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
// StringUtil.indexOf() // StringUtil.indexOf()
// String templateFilePath = configValueUtil.getTemplateFilePath() +"paymentDocPdf//"; // String templateFilePath = configValueUtil.getTemplateFilePath() +"paymentDocPdf//";
Map<String, Object> map = JsonUtil.stringToMap(JSONUtil.toJsonStr(paymentDocMessage)); Map<String, Object> map = JsonUtil.stringToMap(JSONUtil.toJsonStr(paymentDocMessage));
map.put("substring",substring); map.put("substring", substring);
map.put("substring1",substring1); map.put("substring1", substring1);
// map.put("reportList",paymentDocNodeInfo); // map.put("reportList",paymentDocNodeInfo);
FlowBeforeController bean = SpringContext.getBean(FlowBeforeController.class); FlowBeforeController bean = SpringContext.getBean(FlowBeforeController.class);
ActionResult info = null; ActionResult info = null;
@ -497,37 +511,37 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
} catch (WorkFlowException e) { } catch (WorkFlowException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
FlowBeforeInfoVO data = (FlowBeforeInfoVO)info.getData(); FlowBeforeInfoVO data = (FlowBeforeInfoVO) info.getData();
List<FlowTaskOperatorRecordModel> recordList = data.getFlowTaskOperatorRecordList(); List<FlowTaskOperatorRecordModel> recordList = data.getFlowTaskOperatorRecordList();
List<Map<String, Object>> maps = new ArrayList<>(); List<Map<String, Object>> maps = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) { for (int i = 0; i < recordList.size(); i++) {
Map<String, Object> map1 = new HashMap<String, Object>(); Map<String, Object> map1 = new HashMap<String, Object>();
FlowTaskOperatorRecordModel model = recordList.get(i); FlowTaskOperatorRecordModel model = recordList.get(i);
Map<String, Object> map2 = paymentDocNodeInfo.get(i); Map<String, Object> map2 = paymentDocNodeInfo.get(i);
map1.put("realName",model.getUserName()); map1.put("realName", model.getUserName());
map1.put("nodeName",model.getNodeName()); map1.put("nodeName", model.getNodeName());
map1.put("handleOpinion",model.getHandleOpinion()); map1.put("handleOpinion", model.getHandleOpinion());
map1.put("handleTime",DateUtil.daFormat(model.getHandleTime())); map1.put("handleTime", DateUtil.daFormat(model.getHandleTime()));
map1.put("node",map2.get("node")); map1.put("node", map2.get("node"));
maps.add(map1); maps.add(map1);
} }
ArrayList<Map<String, Object>> maps1 = new ArrayList<Map<String, Object>>(); ArrayList<Map<String, Object>> maps1 = new ArrayList<Map<String, Object>>();
int num=6; int num = 6;
if (maps.size()>num){ if (maps.size() > num) {
for (int i = 0; i < maps.size(); i++) { for (int i = 0; i < maps.size(); i++) {
Map<String, Object> map1 = maps.get(i); Map<String, Object> map1 = maps.get(i);
if (i>=num){ if (i >= num) {
maps1.add(map1); maps1.add(map1);
} }
} }
while (maps.size()>num){ while (maps.size() > num) {
maps.remove(num); maps.remove(num);
} }
} }
map.put("reportList",maps); map.put("reportList", maps);
map.put("reportList1",maps1); map.put("reportList1", maps1);
byte[] bytes = null; byte[] bytes = null;
ByteArrayOutputStream out = null; ByteArrayOutputStream out = null;
ExportPdf exportPdf = new ExportPdf(); ExportPdf exportPdf = new ExportPdf();
@ -539,10 +553,10 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
if (substring==null){ if (substring == null) {
substring="城市矿产"; substring = "城市矿产";
} }
String fileName = paymentdocMessage.getCustomerName()==null?substring+"请示.pdf":substring+"请示("+paymentdocMessage.getCustomerName()+").pdf"; String fileName = paymentdocMessage.getCustomerName() == null ? substring + "请示.pdf" : substring + "请示(" + paymentdocMessage.getCustomerName() + ").pdf";
HttpServletResponse response = ServletUtil.getResponse(); HttpServletResponse response = ServletUtil.getResponse();
response.reset(); response.reset();
@ -554,7 +568,7 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// 设置response的Header // 设置response的Header
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + filen ); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + filen);
response.setContentType("application/x-download;charset=utf-8"); response.setContentType("application/x-download;charset=utf-8");
BufferedOutputStream toClient = null; BufferedOutputStream toClient = null;

@ -160,6 +160,7 @@ public class VehicleController {
VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class); VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class);
entity.setId(mainId); entity.setId(mainId);
entity.setDrivername(vehicleCrForm.getDrivername().replaceAll(" ", "")); entity.setDrivername(vehicleCrForm.getDrivername().replaceAll(" ", ""));
entity.setContact(vehicleCrForm.getContact().replaceAll(" ", ""));
// entity.setDrivername(vehicleCrForm.getDrivername().replaceAll( "[\\pP+~$`^=|<>~`$^+=|<>¥;::;. ]", "")); // entity.setDrivername(vehicleCrForm.getDrivername().replaceAll( "[\\pP+~$`^=|<>~`$^+=|<>¥;::;. ]", ""));
vehicleService.save(entity); vehicleService.save(entity);
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");

@ -192,15 +192,15 @@
FROM FROM
jg_purchaseorder AS a jg_purchaseorder AS a
LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id
AND d.delete_mark = '0'
LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id
AND b.delete_mark = '0'
LEFT JOIN jg_material c ON b.material_id = c.id LEFT JOIN jg_material c ON b.material_id = c.id
AND c.delete_mark = '0'
LEFT JOIN jg_contract e ON a.contract_code = e.id LEFT JOIN jg_contract e ON a.contract_code = e.id
AND e.delete_mark = '0'
WHERE WHERE
a.delete_mark = '0' a.delete_mark = '0' AND d.delete_mark = '0' AND b.delete_mark = '0' AND c.delete_mark = '0' AND e.delete_mark = '0'
GROUP BY GROUP BY
a.id, a.id,
b.material_id, b.material_id,
@ -229,15 +229,15 @@
FROM FROM
jg_purchaseorder AS a jg_purchaseorder AS a
LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id
AND d.delete_mark = '0'
LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id
AND b.delete_mark = '0'
LEFT JOIN jg_material c ON b.material_id = c.id LEFT JOIN jg_material c ON b.material_id = c.id
AND c.delete_mark = '0'
LEFT JOIN jg_contract e ON a.contract_code = e.id LEFT JOIN jg_contract e ON a.contract_code = e.id
AND e.delete_mark = '0'
WHERE WHERE
a.delete_mark = '0' a.delete_mark = '0' AND d.delete_mark = '0' AND b.delete_mark = '0' AND c.delete_mark = '0' AND e.delete_mark = '0'
GROUP BY GROUP BY
a.id, a.id,
a.rate, a.rate,

Loading…
Cancel
Save