开票排序

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

@@ -85,6 +85,7 @@
             </if>
         </where>
         ORDER BY
+        T.INVOICE_DATE desc nulls last,
         T.FLOW_FINISHTIME desc nulls last,
         APPLY_DATE DESC nulls last
     </select>

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

@@ -143,7 +143,7 @@
 
     <select id="signAmount" resultType="com.zjugis.business.bean.response.ContractMessageCountResp">
 
-        SELECT NVL(SUM(c.CONTRACT_AMOUNT), 0) as signAmount
+        SELECT NVL(SUM(c.VIRTUAL_AMOUNT), 0) as signAmount
         FROM CONTRACT c
         RIGHT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
         <where>
@@ -169,7 +169,7 @@
 
     <select id="newAmount" resultType="com.zjugis.business.bean.response.ContractMessageCountResp">
 
-        SELECT NVL(SUM(C.CONTRACT_AMOUNT), 0) AS newAmount
+        SELECT NVL(SUM(C.VIRTUAL_AMOUNT), 0) AS newAmount
             FROM CONTRACT c
             RIGHT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
             <where>
@@ -315,7 +315,7 @@
     <select id="messageCountReturn" resultType="java.math.BigDecimal">
         select COALESCE(SUM(COALESCE(t2.RETURN_AMOUNT,0)),0) as returnAmount
         FROM CONTRACT_RETURN_MONEY t2
-        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and AND ( t1.FLOW_STATUS = 90 OR t1.FLOW_STATUS = 99 )
+        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and ( t1.FLOW_STATUS = 90 OR t1.FLOW_STATUS = 99 )
         LEFT JOIN PROJECT pr ON pr.ID = t1.PROJECT_ID
         <where>
             t2.ISVALID = 1 and NVL(t2.BZ,'-1') != '冲红'
@@ -668,7 +668,7 @@
         select t1.AREA_MANAGER_ID as userId, MAX(US.NICKNAME) as nickname,
         COALESCE(SUM(COALESCE(t2.RETURN_AMOUNT,0)),0) as returnAmount
         FROM CONTRACT_RETURN_MONEY t2
-        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and t1.FLOW_STATUS = 90
+        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and ( t1.FLOW_STATUS = 90 OR t1.FLOW_STATUS = 99 )
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS US ON US.ID = t1.AREA_MANAGER_ID
         <where>
             t2.ISVALID = 1 and NVL(t2.BZ,'-1') != '冲红' and t1.AREA_MANAGER_ID is not null

zjugis-business/src/main/resources/templates/Interview/index.ftl

@@ -214,7 +214,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$sflf"
+                                        <div class="z-comp-select" name="createReqVO$xxlf"
                                              data='${point_standard!}' value="${formEntity.xxlf!}" style="width: 80px;">
                                             <div class="z-inputselect-bar">
                                                 <span></span><i></i>
@@ -226,7 +226,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-input" name="createReqVO$sflp" style="width: 250px; ">
+                                        <div class="z-comp-input" name="createReqVO$xxlp" style="width: 250px; ">
                                             <input type="text" placeholder="评语" value="${formEntity.xxlp!}">
                                         </div>
                                     </div>
@@ -377,7 +377,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$xxlf"
+                                        <div class="z-comp-select" name="createReqVO$jbf"
                                              data='${point_standard!}' value="${formEntity.jbf!}" style="width: 80px;">
                                             <div class="z-inputselect-bar">
                                                 <span></span><i></i>
@@ -389,7 +389,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-input" name="createReqVO$xxlp" style="width: 250px; ">
+                                        <div class="z-comp-input" name="createReqVO$jbp" style="width: 250px; ">
                                             <input type="text" placeholder="评语" value="${formEntity.jbp!}">
                                         </div>
                                     </div>