Sfoglia il codice sorgente

已知问题修改

y 2 anni fa
parent
commit
8304617202

+ 4 - 6
src/main/java/com/ydtech/modules/inv/controller/InvAccountIncoiceController.java

@@ -42,11 +42,10 @@ public class InvAccountIncoiceController {
     private InvAccountIncoiceService invAccountIncoiceService;
 
 
-
     @PostMapping("excel")
     @ApiOperation("导出开票记录表")
     public HttpResult selectAccountIncoiceExcel(@RequestBody InvAccountIncoiceQueryVo invAccountIncoiceQueryVo) {
-        return HttpResult.ok("",invAccountIncoiceService.excel(invAccountIncoiceQueryVo));
+        return HttpResult.ok("", invAccountIncoiceService.excel(invAccountIncoiceQueryVo));
     }
 
     /**
@@ -70,8 +69,8 @@ public class InvAccountIncoiceController {
                 .eq(InvAccountIncoice::getDelFlag, "0")
                 .eq(!StringUtils.isEmpty(invAccountIncoice.getInvoiceType()), InvAccountIncoice::getInvoiceType,
                         invAccountIncoice.getInvoiceType())
-                .like(!StringUtils.isEmpty(invAccountIncoice.getOtherUnit()), InvAccountIncoice::getOtherUnit,invAccountIncoice.getOtherUnit())
-                .like(!StringUtils.isEmpty(invAccountIncoice.getClearFlag()), InvAccountIncoice::getClearFlag,invAccountIncoice.getClearFlag());
+                .like(!StringUtils.isEmpty(invAccountIncoice.getOtherUnit()), InvAccountIncoice::getOtherUnit, invAccountIncoice.getOtherUnit())
+                .like(!StringUtils.isEmpty(invAccountIncoice.getClearFlag()), InvAccountIncoice::getClearFlag, invAccountIncoice.getClearFlag());
 
 
         if (!ObjectUtils.isEmpty(invAccountIncoice.getInvoiceTimeStart()) && !ObjectUtils.isEmpty(invAccountIncoice.getInvoiceTimeEnd())) {
@@ -131,7 +130,7 @@ public class InvAccountIncoiceController {
     @PostMapping("updateIncoice")
     @ApiOperation("修改发票信息")
     public HttpResult updateIncoice(@RequestBody InvAccountIncoice invAccountIncoice) {
-        if (!invAccountIncoice.getPayoutMoney().equals("0") && !invAccountIncoice.getNotPayoutMoney().equals(invAccountIncoice.getInvoiceMoney())){
+        if (!invAccountIncoice.getPayoutMoney().equals("0") && !invAccountIncoice.getNotPayoutMoney().equals(invAccountIncoice.getInvoiceMoney())) {
             throw new SystemException("已进账 如需修改请撤销");
         }
         BigDecimal tax = getBigDecimal(invAccountIncoice);
@@ -148,7 +147,6 @@ public class InvAccountIncoiceController {
     }
 
 
-
     /**
      * 撤销
      */

+ 1 - 1
src/main/java/com/ydtech/modules/inv/model/InvAccountExcel.java

@@ -34,7 +34,7 @@ public class InvAccountExcel implements Serializable {
     /**
      * 资金申请表id
      */
-    @TableId(value = "id")
+    @TableId
     @ApiModelProperty(value = "资金申请表id")
     private String excelAccountOperateId;