回款时增加默认金额

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

@@ -206,11 +206,12 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
             returnAmount = relations.stream().map(ContractInvoiceRelation::getReturnAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
         }
         if(invoice.getInvoiceAmount() != null && returnAmount.compareTo(BigDecimal.ZERO) > 0 ){
-            if(invoice.getInvoiceAmount().compareTo(returnAmount) <=0){
+            if(invoice.getInvoiceAmount().compareTo(returnAmount) <=0) {
                 invoice.setFlowStatus(ContractInvoiceConstants.RETURN_FINISH);
-            } else{
-                invoice.setFlowStatus(ContractInvoiceConstants.RETURN_PART);
             }
+//            } else{
+//                invoice.setFlowStatus(ContractInvoiceConstants.RETURN_PART);
+//            }
         }
         contractInvoiceMapper.updateById(invoice);
     }

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

@@ -63,9 +63,9 @@
     </select>
     <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 )/10000 as ykp,
-        sum(NVL(T3.returnAmount,0) )/10000 as yhk
-        FROM CONTRACT_INVOICE T left join CONTRACT_RETURN_MONEY b on T.id=b.CONTRACT_INVOICE_ID
+        sum(case when T.FLOW_STATUS &gt;= 90 then T.INVOICE_AMOUNT else 0 end ) as ykp,
+        sum(NVL(T3.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
         LEFT JOIN

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

@@ -244,5 +244,6 @@
         <if test="params != null and params.year != null and params.year != ''">
             AND TO_CHAR(t2.RETURN_DATE,'YYYY') = #{params.year,jdbcType=VARCHAR}
         </if>
+        </where>
     </select>
 </mapper>

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

@@ -783,5 +783,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
         window.contractList = '${contractListJson!}';
         window.curUserId = '${currentUserId!}' ;
         window.curUser = '${currentUser!}' ;
+        window.invoiceReceivable = '${invoiceReceivable!}';
     </script>
 </@w.workFlow>

zjugis-business/src/main/resources/templates/FlowContractInvoice/js/apply.js

@@ -402,6 +402,15 @@
     }
 
 
+    function getCurrentDate() {
+        const now = new Date();
+        const year = now.getFullYear();
+        const month = (now.getMonth() + 1).toString().padStart(2, '0');
+        const day = now.getDate().toString().padStart(2, '0');
+        return `${year}-${month}-${day}`;
+    }
+
+
     function addContractReturnMoney(){
         var trFragment = document.createDocumentFragment();
         let tbody = document.querySelectorAll('[name=returnMoney] tr')
@@ -409,8 +418,8 @@
         var dataObj = {
             contractMilestoneName: contractMilestoneName,
             contractMilestoneId: contractMilestoneId,
-            returnAmount: "",
-            returnDate:  "",
+            returnAmount: window.invoiceReceivable,
+            returnDate:  getCurrentDate(),
             bz: "",
             id: "",
             contractId: contractId,
@@ -736,7 +745,7 @@
             + '<div class="form-flex">'
             + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
             + '<div class="z-comp-input" name="ContractReturnMoney[' + index + ']$returnAmount">'
-            + '<input type="text" class="returnAmount" value="">'
+            + '<input type="text" class="returnAmount" value="'+lists[i].returnAmount+'">'
             + '</div>'
             + '</div>'
             + '</div>'
@@ -745,7 +754,7 @@
             + '<div class="form-flex">'
             + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
             + '<div class="z-comp-date" name="ContractReturnMoney[' + index + ']$returnDate">'
-            + '<input type="text" value="">'
+            + '<input type="text" value="'+lists[i].returnDate+'">'
             + '</div>'
             + '</div>'
             + '</div>'