Merge branch 'fms_2.5'

controller/contract/register.go

@@ -1026,7 +1026,7 @@ func (rg *RegisterController) UpdateStatus(c *gin.Context) {
 	}
 
 	// 校验金额-是否修改状态
-	go fmsService.CheckContractRegisterAmount(req.ContractRegisterId)
+	fmsService.CheckContractRegisterAmount(req.ContractRegisterId)
 
 	// 操作日志
 	go func() {
@@ -1779,8 +1779,8 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		fms.ContractTypebehalf: 1,
 	}
 	contractSubTMap := map[int]int{
-		fms.NewContractTypeNew:   0,
-		fms.NewContractTypeRenew: 1,
+		fms.NewContractTypeNew:   1,
+		fms.NewContractTypeRenew: 0,
 		fms.NewContractTypePlus:  2, // 代付合同
 	}
 	for _, v := range list {

services/fms/contract_register.go

@@ -61,7 +61,7 @@ func CheckContractRegisterAmount(registerId int) {
 	status := fms.ContractRegisterStatusIng
 	// 以下情况更新合同登记状态为已完成
 	// 1.合同存在代付; 2.合同状态为已签回且合同金额=开票金额=到款金额; 3合同状态为已终止
-	if item.HasPayment == 1 || (amount.Equal(invoiceAmount) && invoiceAmount.Equal(paymentAmount) && item.ContractStatus == fms.ContractStatusCheckedBack) || item.ContractStatus == fms.ContractStatusEnd {
+	if item.HasInvoice == 0 || (amount.Equal(invoiceAmount) && invoiceAmount.Equal(paymentAmount) && item.ContractStatus == fms.ContractStatusCheckedBack) || item.ContractStatus == fms.ContractStatusEnd {
 		status = fms.ContractRegisterStatusComplete
 	}
 	updateCols := []string{"InvoicedAmount", "PaymentAmount", "RegisterStatus", "ModifyTime"}