feature(结算): 计费结算统计报告查询逻辑优化

model/account/settle_account_main.go

@@ -28,7 +28,11 @@ type SettleAccountMainReq struct {
 	FeeType   string `json:"feeType"`
 	AppointStartDate string `json:"appointStartDate"`
 	AppointEndDate string `json:"appointEndDate"`
-	SettleDate string `json:"settleDate"`
+	VerificationDate string `json:"verificationDate"`
+	SettleStartDate string `json:"settleStartDate"`
+	SettleEndDate string `json:"settleEndDate"`
+	ActualStartDate string `json:"actualStartDate"`
+	ActualEndDate string `json:"actualEndDate"`
 }
 
 type AccountMainConfirmReq struct {

service/settle_account_main/settle_account_main.go

@@ -75,10 +75,16 @@ func (s Service) List(req model.ListReq) ([]accountModel.SettleAccountMain, int,
 		if entity.AppointStartDate != "" && entity.AppointEndDate != "" {
 			where += fmt.Sprintf(" AND AppointStartDate>'%v' AND AppointEndDate<'%v'", entity.AppointStartDate, entity.AppointEndDate)
 		}
-		if entity.SettleDate != "" {
-			timelist := strings.Split(entity.SettleDate,",")
+		if entity.ActualStartDate != "" && entity.ActualEndDate != "" {
+			where += fmt.Sprintf(" AND ActualStartDate>'%v' AND ActualEndDate<'%v'", entity.ActualStartDate, entity.ActualEndDate)
+		}
+		if entity.SettleStartDate != "" && entity.SettleEndDate != "" {
+			where += fmt.Sprintf(" AND SettleDate>'%v' AND SettleDate<'%v'", entity.SettleStartDate, entity.SettleEndDate)
+		}
+		if entity.VerificationDate != "" {
+			timelist := strings.Split(entity.VerificationDate,",")
 			if len(timelist) == 2 {
-				where += fmt.Sprintf(" AND SettleDate>'%v' AND SettleDate<'%v'", timelist[0],timelist[1])
+				where += fmt.Sprintf(" AND VerificationDate>'%v' AND VerificationDate<'%v'", timelist[0],timelist[1])
 			}
 		}
 	}