diff --git a/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/api/IBusinessInvoicingController.java b/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/api/IBusinessInvoicingController.java
index 7b50c9a7c1b89dc4853a013b475c8b249cdf2d40..82c95140a68241fbca28b86f680d037f1c47e233 100644
--- a/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/api/IBusinessInvoicingController.java
+++ b/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/api/IBusinessInvoicingController.java
@@ -30,15 +30,15 @@ public interface IBusinessInvoicingController {
@PostMapping("markInvoice")
Result<Object> markInvoice(@Validated @RequestBody MarkInvoiceRequest markInvoiceRequest);
- @ApiOperation("鏌ヨ鍙戠エ淇℃伅(璋冩暣鏌ヨ)")
+ @ApiOperation("璋冩暣鍙戠エ淇℃伅(鏌ヨ)")
@PostMapping("findInvoiceInfo")
Result<InvoiceInfoResult> findInvoiceInfo(@RequestParam("incomeId") Long incomeId);
@ApiOperation("瀵煎嚭")
@PostMapping("exportInvoice")
void exportInvoice(HttpServletResponse response) throws JsonProcessingException;
-
- @ApiOperation("浣滃簾")
- @PostMapping("repeal")
- void repeal(@RequestParam("invoiceId") Long invoiceId);
+
+ @ApiOperation("璋冩暣鍙戠エ淇℃伅(淇濆瓨)")
+ @PostMapping("saveInvoiceInfo")
+ Result<Object> saveInvoiceInfo();
}
diff --git a/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/AdjustInvoiceSaveRequest.java b/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/AdjustInvoiceSaveRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ce496d472983892f530e5068f0de139c629f9c95
--- /dev/null
+++ b/ServiceSiteCommon/facade/src/main/java/com/seasky/template/web/dto/request/AdjustInvoiceSaveRequest.java
@@ -0,0 +1,26 @@
+package com.seasky.template.web.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author jxm
+ * @Date 2024/12/24 9:11
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdjustInvoiceSaveRequest {
+
+ @ApiModelProperty(value = "鍥炲崟id")
+ private Long incomeId;
+
+
+
+}
+
+
+
diff --git a/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/mapper/IncomeInvoiceMapper.java b/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/mapper/IncomeInvoiceMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..44c1a4da8f25f02eaa44ec9f903274ad60de181c
--- /dev/null
+++ b/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/mapper/IncomeInvoiceMapper.java
@@ -0,0 +1,9 @@
+package com.seasky.template.business.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.seasky.template.business.entity.IncomeInvoice;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IncomeInvoiceMapper extends BaseMapper<IncomeInvoice> {
+}
diff --git a/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/xml/InvoiceMapper.xml b/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/xml/InvoiceMapper.xml
index 5b6edf897c3f30fb66f1619d9cde8676cbbe3865..7279cda12f189fb321b0f28ccb9143e07b40e321 100644
--- a/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/xml/InvoiceMapper.xml
+++ b/ServiceSiteCommon/src/main/java/com/seasky/template/business/dao/xml/InvoiceMapper.xml
@@ -57,6 +57,8 @@
LEFT JOIN
t_return_file e
on e.invoice_id = a.id AND e.available = 'YES'
+ LEFT JOIN
+ t_income_claim f on f.income_id = c.id AND f.available = 'YES' and f.state = '瀹℃壒閫氳繃'
WHERE
a.available = 'YES' -- 灏嗚繃婊ゆ潯浠舵斁鍦ㄤ富琛ㄤ笂
<if test = "qry.billNo!=null and qry.billNo!=''">
@@ -161,8 +163,10 @@
ON b.income_id = c.id AND c.available = 'YES'
LEFT JOIN t_invoice_detail d
ON a.id = d.invoice_id AND d.available = 'YES'
+ LEFT JOIN
+ t_income_claim f on f.income_id = c.id AND f.available = 'YES'
WHERE
- a.available = 'YES' and a.invoice_state = '寰呭紑'
+ a.available = 'YES' and a.invoice_state = '寰呭紑' and f.state='瀹℃壒閫氳繃'
GROUP BY
c.bill_no,
a.invoice_type,
diff --git a/ServiceSiteCommon/src/main/java/com/seasky/template/business/entity/IncomeInvoice.java b/ServiceSiteCommon/src/main/java/com/seasky/template/business/entity/IncomeInvoice.java
new file mode 100644
index 0000000000000000000000000000000000000000..85c2eac9912ede92cc2ff6a867a7a88ce3a71e0c
--- /dev/null
+++ b/ServiceSiteCommon/src/main/java/com/seasky/template/business/entity/IncomeInvoice.java
@@ -0,0 +1,22 @@
+package com.seasky.template.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.seasky.core.base.BaseModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author jxm
+ * @Date 2024/12/24 8:59
+ * @Version 1.0
+ */
+@TableName("t_income_invoice")
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class IncomeInvoice extends BaseModel {
+
+ private Long incomeId;
+ private Long invoiceId;
+}
diff --git a/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/InvoiceServiceImpl.java b/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/InvoiceServiceImpl.java
index e210b64f7514ebbd8c16893ec53ade2609c38e58..0ae81c94354bfe511b845c619e47e3ab674e4027 100644
--- a/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/InvoiceServiceImpl.java
+++ b/ServiceSiteCommon/src/main/java/com/seasky/template/business/service/InvoiceServiceImpl.java
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.seasky.core.base.AbstractService;
import com.seasky.core.common.Pagination;
import com.seasky.template.business.api.InvoiceService;
+import com.seasky.template.business.dao.mapper.IncomeInvoiceMapper;
import com.seasky.template.business.dao.mapper.InvoiceMapper;
+import com.seasky.template.business.entity.IncomeInvoice;
import com.seasky.template.business.entity.Invoice;
import com.seasky.template.enums.InvoiceEnum;
import com.seasky.template.web.dto.request.InvoiceDownRequest;
@@ -15,6 +17,7 @@ import com.seasky.template.web.dto.result.InvoiceInfoResult;
import com.seasky.template.web.dto.result.InvoicingTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@@ -23,6 +26,8 @@ import java.util.List;
public class InvoiceServiceImpl extends AbstractService<Invoice, InvoiceMapper> implements InvoiceService {
@Autowired
InvoiceMapper mapper;
+ @Autowired
+ IncomeInvoiceMapper incomeInvoiceMapper;
@Override
public Pagination<InvoiceDownResult> selectListPage(InvoiceDownRequest qry,String code) {
Pagination pagination = new Pagination();
@@ -55,11 +60,17 @@ public class InvoiceServiceImpl extends AbstractService<Invoice, InvoiceMapper>
return result;
}
+ @Transactional
@Override
public void repeal(Long invoiceId) {
UpdateWrapper<Invoice> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id",invoiceId);
updateWrapper.set("available","NO");
mapper.update(null,updateWrapper);
+ //瑙ｉ櫎鍏宠仈鍏崇郴
+ UpdateWrapper<IncomeInvoice> incomeInvoiceUpdateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("invoice_id",invoiceId);
+ updateWrapper.set("available","NO");
+ incomeInvoiceMapper.update(null,incomeInvoiceUpdateWrapper);
}
}
diff --git a/ServiceSiteCommon/src/main/java/com/seasky/template/web/controller/BusinessInvoicingController.java b/ServiceSiteCommon/src/main/java/com/seasky/template/web/controller/BusinessInvoicingController.java
index db36d6b138db62d08e5efc7effeb62d0ecf9031d..c20f1c6b74d186c0a5a8b2286dc6107340e3cca7 100644
--- a/ServiceSiteCommon/src/main/java/com/seasky/template/web/controller/BusinessInvoicingController.java
+++ b/ServiceSiteCommon/src/main/java/com/seasky/template/web/controller/BusinessInvoicingController.java
@@ -80,7 +80,9 @@ public class BusinessInvoicingController implements IBusinessInvoicingController
}
@Override
- public void repeal(Long invoiceId) {
- invoiceService.repeal(invoiceId);
+ public Result<Object> saveInvoiceInfo() {
+
+
+ return null;
}
}