开票导出

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractInvoiceExcelResponse.java

@@ -11,6 +11,8 @@ import lombok.Data;
 @Data
 public class ContractInvoiceExcelResponse {
 
+    @ExcelProperty("行政区")
+    private String xzqmc;
     @ExcelProperty("开票单位")
     private String invoiceCompany;
     @ExcelProperty("合同区域经理")

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractResponse.java

@@ -208,6 +208,8 @@ public class ContractResponse {
      */
     private String projectId;
 
+    private String bankaccount;
+
     private Integer isSign;
 
     private Integer signWay;

zjugis-business/src/main/java/com/zjugis/business/controller/ContractInvoiceController.java

@@ -11,7 +11,6 @@ import com.zjugis.business.service.ContractInvoiceRelationService;
 import com.zjugis.business.service.ContractInvoiceService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.excel.core.util.ExcelUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,7 +19,6 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -79,14 +77,7 @@ public class ContractInvoiceController {
     @PostMapping("/contract-invoice/list/excel")
     public void export( @RequestBody ContractInvoiceDto contractInvoiceDto,
                         HttpServletResponse response) throws IOException {
-        List<ContractInvoiceExcelResponse> invoiceList = contractInvoiceService.excel(contractInvoiceDto);
-
-        List<ContractInvoiceExcelResponse> excelList = new ArrayList<>(invoiceList.size());
-        invoiceList.forEach(invoice -> {
-            ContractInvoiceExcelResponse item = new ContractInvoiceExcelResponse();
-            BeanUtils.copyProperties(invoice,item);
-            excelList.add(item);
-        });
+        List<ContractInvoiceExcelResponse> excelList = contractInvoiceService.excel(contractInvoiceDto);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String format = simpleDateFormat.format(new Date());
         response.setContentType("multipart/form-data");

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractInvoiceServiceImpl.java

@@ -140,7 +140,7 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
         invoice.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
         invoice.setContractId(contractId);
         invoice.setProjectId(contract.getProjectId());
-        invoice.setReceiveBankaccount("浙江万维空间信息技术有限公司  江苏银行杭州分行营业部  33200188000384287");
+        invoice.setReceiveBankaccount(contract.getBankaccount());
         if(StringUtils.isNotBlank(contract.getClientId())){
             Customer customer = customerService.queryById(contract.getClientId());
             invoice.setCustomerName(customer.getCustomerName());

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zjugis.business.mapper.ContractInvoiceMapper">
     <select id="page" resultType="com.zjugis.business.bean.response.ContractInvoiceResponse">
-        SELECT T.*,T1.CONTRACT_NUMBER AS contractNumber,T1.NAME,T2.XMMC,T2.XMBH,t3.maxd as returnDate,T3.returnAmount,U.NICKNAME AS XSRY,D.NAME as ZRBM
+        SELECT T.*,T1.CONTRACT_NUMBER AS contractNumber,T1.NAME,T2.XMMC,T2.XMBH,T4.maxd as returnDate,T4.returnAmount,U.NICKNAME AS XSRY,D.NAME as ZRBM
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
@@ -79,7 +79,7 @@
     <select id="getStatics" resultType="com.zjugis.business.bean.response.ContractInvoiceStaticsResponse">
         SELECT
         sum(case when T.FLOW_STATUS &gt;= 90 then T.INVOICE_AMOUNT else 0 end ) as ykp,
-        sum(NVL(T3.returnAmount,0) ) as yhk
+        sum(NVL(T4.returnAmount,0)) as yhk
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
@@ -157,7 +157,7 @@
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
         LEFT JOIN PROJECT_TYPE T3 ON T3.ID = T2.PROJECT_TYPE_ID
         LEFT JOIN CUSTOMER T4 ON T4.ID = T.PAY_COMPANY_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_COMPANY C ON T3.ID = T.INVOICE_COMPANY_ID
+        LEFT JOIN ZJUGIS_OA.SYSTEM_COMPANY C ON C.ID = T.INVOICE_COMPANY_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
         LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T5 ON T5.CONTRACT_INVOICE_ID=T.ID

zjugis-business/src/main/resources/templates/FlowContract/apply.ftl

@@ -383,6 +383,20 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                               </div>
                           </td>
                       </tr>
+                      <tr>
+                          <td class="th">
+                              <div class="form-label">收款银行账户：</div>
+                          </td>
+                          <td colspan="3">
+                              <div class="form-group">
+                                  <div class="form-item">
+                                      <div class="z-comp-input" name="contract$bankaccount">
+                                          <input type="text" value="${formEntity.bankaccount!}">
+                                      </div>
+                                  </div>
+                              </div>
+                          </td>
+                      </tr>
                       <tr>
                           <td class="th">
                               <div class="form-label">备注：</div>

zjugis-workflow/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:8-jre
+FROM openjdk:8-jdk
 
 MAINTAINER ljy