diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java index 016914a..0605363 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java @@ -359,16 +359,18 @@ public class InvoiceCheckWebServiceImpl { JSONObject getInvoiceVOJson = JSONObject.parseObject(getInvoiceVOJsonStr); Element getInvoiceDoc = json2Element(result, "Fp", getInvoiceVOJson); + int count = 1; for (GetInvoiceSphVO getInvoiceSphVO : getInvoiceSphVOList) { // JSONObject getInvoiceSphVOJson = (JSONObject) JSONObject.toJSON(getInvoiceSphVO); // 航信明细行从1开始 - getInvoiceSphVO.setId(getInvoiceSphVO.getId() + 1); + getInvoiceSphVO.setId(getInvoiceSphVO.getId() + count); // 防止转义 String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial); getInvoiceSphVOJsonStr = getInvoiceSphVOJsonStr.replace("免税","0.0%").replace("***","0.00"); JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr); Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson); getInvoiceDoc.appendChild(sphElement); + count ++; } return buildResult(result, "1", "查验成功", getInvoiceDoc); diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java index 6df6b8e..f8eebc4 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java @@ -2,6 +2,7 @@ package com.jianshui.web.controller.platform; import com.jianshui.common.core.domain.AjaxResult; import com.jianshui.invoice.domain.dto.FindRedWordDTO; +import com.jianshui.invoice.domain.dto.HXResponse; import com.jianshui.platform.dto.invoicered.RedWordSelectionDTO; import com.jianshui.platform.dto.invoicered.RedWordDTO; import com.jianshui.platform.service.RedInformationService; @@ -37,10 +38,34 @@ public class RedInformationController { return redInformationService.redWordSubmit(dto); } - @ApiOperation("红字信息表列表展示") + @ApiOperation("红字信息列表展示") @PostMapping("/findRedWord") public AjaxResult findRedWord(@RequestBody FindRedWordDTO dto){ return redInformationService.findRedWord(dto); } + @ApiOperation("红字信息明细展示") + @GetMapping("/findRedWordDetail/{id}") + public AjaxResult findRedWordDetail(@PathVariable Long id){ + return redInformationService.findRedWordDetail(id); + } + + @ApiOperation("红字信息删除") + @DeleteMapping("/deleteRedWord/{ids}") + public AjaxResult deleteRedWord(@PathVariable Long[] ids){ + return redInformationService.deleteRedWord(ids); + } + + @ApiOperation("红字信息修改") + @PutMapping("/updateRedWord") + public AjaxResult updateRedWord(@RequestBody RedWordDTO dto){ + return redInformationService.updateRedWord(dto); + } + + @ApiOperation("红字信息上传") + @GetMapping("/uploadRedWord/{id}") + public HXResponse uploadRedWord(@PathVariable Long id){ + // TODO 暂未开发完成 + return redInformationService.uploadRedWord(id); + } } diff --git a/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml b/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml index fa1241a..6c98da1 100644 --- a/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml +++ b/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml @@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where a.id = #{id}