Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/financialManagement/bzjglDeptPage/index.vue

@@ -243,20 +243,22 @@ const getOverview = async () => {
     queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
   }
   const data = await UseMoneyApi.getUseMoneyOverviewHx(queryParams)
-  if (data.totalAmount > 100000) {
-    infoList.value[0].num = data.totalAmount / 10000
-    infoList.value[1].num = data.totalUseAmount / 10000
-    infoList.value[2].num = data.totalApplyAmount / 10000
-    infoList.value[0].name = '保证金总金额(万元)'
-    infoList.value[1].name = '已核销总金额(万元)'
-    infoList.value[2].name = '未核销总金额(万元)'
-  } else {
-    infoList.value[0].num = data.totalAmount
-    infoList.value[1].num = data.totalUseAmount
-    infoList.value[2].num = data.totalApplyAmount
-    infoList.value[0].name = '保证金总金额(元)'
-    infoList.value[1].name = '已核销总金额(元)'
-    infoList.value[2].name = '未核销总金额(元)'
+  if (data) {
+    if (data.totalAmount > 100000) {
+      infoList.value[0].num = data.totalAmount / 10000
+      infoList.value[1].num = data.totalUseAmount / 10000
+      infoList.value[2].num = data.totalApplyAmount / 10000
+      infoList.value[0].name = '保证金总金额(万元)'
+      infoList.value[1].name = '已核销总金额(万元)'
+      infoList.value[2].name = '未核销总金额(万元)'
+    } else {
+      infoList.value[0].num = data.totalAmount
+      infoList.value[1].num = data.totalUseAmount
+      infoList.value[2].num = data.totalApplyAmount
+      infoList.value[0].name = '保证金总金额(元)'
+      infoList.value[1].name = '已核销总金额(元)'
+      infoList.value[2].name = '未核销总金额(元)'
+    }
   }
 }
 const formRef = ref()

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

@@ -52,4 +52,8 @@ public class ContractMessageResponse {
     private LocalDateTime createTime;
 
     private String contractInvoiceId;
+
+    private String invoiceInstanceId;
+
+    private String projectId;
 }

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

@@ -190,7 +190,9 @@ public class ContractServiceImpl implements ContractService{
             UseMoneyBondVO qualityMoney = useMoneyDetailService.getBondData(dbParent.getProjectId());
             ContractResponse r = new ContractResponse();
             if(qualityMoney!= null){
-                r.setQualityMoney(new BigDecimal(String.valueOf(qualityMoney.getTotalAmount())));
+                if(qualityMoney.getTotalAmount() != null){
+                    r.setQualityMoney(new BigDecimal(String.valueOf(qualityMoney.getTotalAmount())));
+                }
                 r.setQualityMoneyStatus(qualityMoney.getIWriteOff());
             }
             BeanUtils.copyProperties(dbParent, r);

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

@@ -3,9 +3,10 @@
 <mapper namespace="com.zjugis.business.mapper.ContractMessageMapper">
 
     <select id="page" resultType="com.zjugis.business.bean.response.ContractMessageResponse">
-        SELECT cm.*,T2.ID as contractInvoiceId FROM CONTRACT_MESSAGE cm
+        SELECT cm.*,T2.ID as contractInvoiceId,T2.INSTANCE_ID as invoiceInstanceId,T3.PROJECT_ID as projectId FROM CONTRACT_MESSAGE cm
         LEFT JOIN CONTRACT_RETURN_MONEY T1 on T1.ID = cm.BUSINESS_ID and cm.MESSAGE_TYPE = 2
-        LEFT JOIN CONTRACT_INVOICE_ID T2 on T2.ID = T1.CONTRACT_INVOICE_ID
+        LEFT JOIN CONTRACT_INVOICE T2 on T2.ID = T1.CONTRACT_INVOICE_ID
+        LEFT JOIN CONTRACT T3 on T3.ID = cm.CONTRACT_ID and cm.MESSAGE_TYPE = 1
         <if test="params != null and params.deptId != null and params.deptId != ''">
             RIGHT JOIN CONTRACT c ON c.ID = cm.CONTRACT_ID
             RIGHT JOIN PROJECT p ON p.ID = c.PROJECT_ID
@@ -25,6 +26,6 @@
                 AND AM.AREA_MANAGER_ID = #{params.managerId}
             </if>
         </where>
-        ORDER BY CREATE_TIME DESC
+        ORDER BY cm.CREATE_TIME DESC
     </select>
 </mapper>

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

@@ -11,6 +11,8 @@
         from
         WF_USE_MONEY_DETAIL T
         left join  WF_USE_MONEY T1 ON T.USE_MONEY_ID=T1.ID
-        where PROJECT_ID=#{projectId} and T.COST_TYPE='1401' and T1.FLOW_STATUS=90 AND T1.ISVALID = 1 AND T2.ISVALID = 1
+        where (T.PROJECT_ID=#{projectId} or T1.PROJECT_ID=#{projectId})
+
+          and T.COST_TYPE='1401' and T1.FLOW_STATUS=90 AND T1.ISVALID = 1 AND T.ISVALID = 1
     </select>
 </mapper>