|
@@ -252,7 +252,7 @@ public class OwnBillController extends BaseController {
|
|
|
//文件名称
|
|
|
map.put("name",pubFileInf.getPfiFileName());
|
|
|
//文件url
|
|
|
- map.put("url",pubFileInf.getPfiFileUrl());
|
|
|
+ map.put("url",pubFileInf.getPfiUrl());
|
|
|
//时间格式化
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
String date = sdf.format(map.get("ziiDate"));
|
|
@@ -314,7 +314,7 @@ public class OwnBillController extends BaseController {
|
|
|
iZcBillInvoiceRelService.createZcBillInvoiceRel(zcBillInvoiceRel);
|
|
|
Map map = new HashMap();
|
|
|
map.put("name",fileResult.getData().getPfiFileName());
|
|
|
- map.put("url",fileResult.getData().getPfiFileUrl());
|
|
|
+ map.put("url",fileResult.getData().getPfiUrl());
|
|
|
//将发票对象转换成Map集合重新组合
|
|
|
if (zcInvoiceInf != null) {
|
|
|
BeanMap beanMap = BeanMap.create(zcInvoiceInf);
|
|
@@ -363,10 +363,25 @@ public class OwnBillController extends BaseController {
|
|
|
ZcInvoiceInf zcInvoiceInf = iZcInvoiceInfService.getById(jsonObject.getString("ziiId"));
|
|
|
|
|
|
LambdaQueryWrapper<ZcInvoiceInf> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ //时间格式化
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
//发票代码
|
|
|
- queryWrapper.eq(ZcInvoiceInf::getZiiNo,jsonObject.getString("ziiNo"));
|
|
|
+ String ziiNo = jsonObject.getString("ziiNo");
|
|
|
+ //发票号码
|
|
|
+ String ziiNumber = jsonObject.getString("ziiNumber");
|
|
|
+ //发票日期
|
|
|
+ String ziiDate = jsonObject.getString("ziiDate");
|
|
|
+ //购方纳税人识别号
|
|
|
+ String ziiPurchaserNo = jsonObject.getString("ziiPurchaserNo");
|
|
|
+ //销方纳税人识别号
|
|
|
+ String ziiSellerNo = jsonObject.getString("ziiSellerNo");
|
|
|
+ //发票金额
|
|
|
+ String ziiAmount = jsonObject.getString("ziiAmount");
|
|
|
+ //价税合计
|
|
|
+ String ziiTotalAmount = jsonObject.getString("ziiTotalAmount");
|
|
|
+ queryWrapper.eq(ZcInvoiceInf::getZiiNo,ziiNo);
|
|
|
//发票号码
|
|
|
- queryWrapper.eq(ZcInvoiceInf::getZiiNumber,jsonObject.getString("ziiNumber"));
|
|
|
+ queryWrapper.eq(ZcInvoiceInf::getZiiNumber,ziiNumber);
|
|
|
//发票主键
|
|
|
queryWrapper.ne(ZcInvoiceInf::getZiiId,jsonObject.getString("ziiId"));
|
|
|
//发票状态
|
|
@@ -384,6 +399,14 @@ public class OwnBillController extends BaseController {
|
|
|
}else{
|
|
|
zcInvoiceInf.setZiiCheckStt("3");
|
|
|
}
|
|
|
+ zcInvoiceInf.setZiiNo(ziiNo);
|
|
|
+ zcInvoiceInf.setZiiNumber(ziiNumber);
|
|
|
+ zcInvoiceInf.setZiiDate(sdf.parse(ziiDate));
|
|
|
+ zcInvoiceInf.setZiiPurchaserNo(ziiPurchaserNo);
|
|
|
+ zcInvoiceInf.setZiiSellerNo(ziiSellerNo);
|
|
|
+ zcInvoiceInf.setZiiAmount(ziiAmount);
|
|
|
+ zcInvoiceInf.setZiiExcludedAmount(ziiAmount);
|
|
|
+ zcInvoiceInf.setZiiTotalAmount(ziiTotalAmount);
|
|
|
zcInvoiceInf.setUpdateBy(user.getUserid().toString());
|
|
|
zcInvoiceInf.setUpdateTime(DateUtils.getNowDate());
|
|
|
//修改发票信息
|
|
@@ -454,7 +477,7 @@ public class OwnBillController extends BaseController {
|
|
|
Map map = new HashMap();
|
|
|
map.put("id",fileResult.getData().getPfiFileId());
|
|
|
map.put("name",fileResult.getData().getPfiFileName());
|
|
|
- map.put("url",fileResult.getData().getPfiFileUrl());
|
|
|
+ map.put("url",fileResult.getData().getPfiUrl());
|
|
|
//返回附件信息
|
|
|
return R.ok(map);
|
|
|
}
|
|
@@ -485,7 +508,7 @@ public class OwnBillController extends BaseController {
|
|
|
//文件名称
|
|
|
map.put("name",pubFileInf.getPfiFileName());
|
|
|
//文件url
|
|
|
- map.put("url",pubFileInf.getPfiFileUrl());
|
|
|
+ map.put("url",pubFileInf.getPfiUrl());
|
|
|
list.add(map);
|
|
|
}
|
|
|
return AjaxResult.success(list);
|