|
|
@ -436,6 +436,8 @@ func (impl *CustDemandVerHeadDAOImplement) SelectData(paging *grmi.Paging, group |
|
|
|
|
|
|
|
joinstr := " INNER JOIN AP_UserCustlst ON AP_CustDemandVerHead.PlantNr = AP_UserCustlst.PlantNr AND AP_CustDemandVerHead.CustomerId = AP_UserCustlst.CustomerId INNER JOIN AP_CustDemandHead ON AP_CustDemandVerHead.PlantNr = AP_CustDemandHead.PlantNr AND AP_CustDemandVerHead.CustomerId = AP_CustDemandHead.CustomerId AND AP_CustDemandVerHead.VersionId = AP_CustDemandHead.VersionId " |
|
|
|
|
|
|
|
where += fmt.Sprintf(" AND AP_UserCustlst.UserId = '%s'", impl.userid) |
|
|
|
|
|
|
|
if customerId != "" { |
|
|
|
where += fmt.Sprintf(" AND AP_CustDemandVerHead.CustomerId = '%s'", customerId) |
|
|
|
} |
|
|
@ -469,7 +471,7 @@ func (impl *CustDemandVerHeadDAOImplement) SelectData(paging *grmi.Paging, group |
|
|
|
where := fmt.Sprintf("AP_CustDemandVerHead.PlantNr = %d", impl.plantNr) |
|
|
|
|
|
|
|
joinstr := " INNER JOIN AP_UserCustlst ON AP_CustDemandVerHead.PlantNr = AP_UserCustlst.PlantNr AND AP_CustDemandVerHead.CustomerId = AP_UserCustlst.CustomerId " |
|
|
|
|
|
|
|
where += fmt.Sprintf(" AND AP_UserCustlst.UserId = '%s'", impl.userid) |
|
|
|
if customerId != "" { |
|
|
|
where += fmt.Sprintf(" AND AP_CustDemandVerHead.CustomerId = '%s'", customerId) |
|
|
|
} |
|
|
@ -516,6 +518,7 @@ func (impl *CustDemandVerHeadDAOImplement) SelectDataCount(grouptype string, cus |
|
|
|
session = session.Join("INNER", "AP_CustDemandHead", "AP_CustDemandHead.PlantNr = AP_CustDemandVerHead.PlantNr And AP_CustDemandHead.CustomerId = AP_CustDemandVerHead.CustomerId And AP_CustDemandHead.VersionId = AP_CustDemandVerHead.VersionId") |
|
|
|
|
|
|
|
session = session.Join("INNER", "AP_UserCustlst", "AP_CustDemandVerHead.PlantNr = AP_UserCustlst.PlantNr And AP_CustDemandVerHead.CustomerId = AP_UserCustlst.CustomerId").Where("AP_CustDemandVerHead.PlantNr = ? and AP_UserCustlst.UserId = ?", impl.plantNr, impl.userid) |
|
|
|
|
|
|
|
if customerId != "" { |
|
|
|
session = session.And("AP_CustDemandVerHead.CustomerId = ?", customerId) |
|
|
|
} |
|
|
|