Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

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

@@ -138,4 +138,8 @@ public class ContractSubResp implements Serializable {
     private String zrbmId;
 
     private String contractApplyId;
+
+    private BigDecimal applyPayAmount;
+
+    private BigDecimal applyContractAmount;
 }

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

@@ -69,7 +69,9 @@
     </select>
 
     <select id="selectListByParentId" resultType="com.zjugis.business.bean.response.ContractSubResp">
-        SELECT t.*,t2.CUSTOMER_NAME as supplier,t3.NICKNAME as qualityController FROM CONTRACT_SUB t
+        SELECT t.*,t2.CUSTOMER_NAME as supplier,t3.NICKNAME as qualityController,
+               t1.PAY_AMOUNT as applyPayAmount,t1.CONTRACT_AMOUNT as applyContractAmount
+               FROM CONTRACT_SUB t
         LEFT JOIN CONTRACT_APPLY t1 on t1.ID = t.CONTRACT_APPLY_ID
         LEFT JOIN SUPPLIER t2 on t2.ID = t1.SUPPLIER_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS t3 ON t3.ID = t.QUALITY_CONTROLLER_ID