@ -24,6 +24,21 @@ type CSurveysheet struct {
Lastmodifyby string ` json:"lastmodifyby" xorm:"default 'NULL' comment('修改人员') VARCHAR(40)" `
CSurveysheetResult CSurveysheetResult ` json:"cSurveysheetResult" xorm:"-" `
Valst [ ] CSurveysheetSubjectlst ` json:"valst" xorm:"-" `
AllPerson int ` xorm:"-" `
A_Person int ` xorm:"-" ` //25岁以下
A_Per string ` xorm:"-" ` //25岁以下百分比
B_Person int ` xorm:"-" ` //25-35岁
B_Per string ` xorm:"-" ` //25-35岁 百分比
C_Person int ` xorm:"-" ` //35-45岁
C_Per string ` xorm:"-" ` //35-45岁 百分比
D_Person int ` xorm:"-" ` //45-55岁
D_Per string ` xorm:"-" ` //45-55岁百分比
E_Person int ` xorm:"-" ` //55岁以上
E_Per string ` xorm:"-" ` //55岁以上百分比
}
type Cvalst struct {
@ -437,7 +452,7 @@ func (t *CSurveysheet) SelectOne(level int) (CSurveysheet, error) {
}
//查卷子
func ( t * CSurveysheet ) SelectOneInfo ( level , surveynr int ) ( CSurveysheet , error ) {
func ( t * CSurveysheet ) SelectOneInfo ( level int , lastmodifyby string ) ( CSurveysheet , error ) {
e := db . MasterEngine ( )
var data CSurveysheet
_ , err := e . ID ( core . PK { t . Cid , t . Cnr , t . Surveysheetid } ) . Get ( & data )
@ -445,7 +460,7 @@ func (t *CSurveysheet) SelectOneInfo(level, surveynr int) (CSurveysheet, error)
return data , err
}
//试卷头部
_ , err = e . Table ( "c_surveysheet_result" ) . Where ( "cid = ? and cnr = ? and surveysheetid = ? and surveynr = ?" , t . Cid , t . Cnr , t . Surveysheetid , surveynr ) . Get ( & data . CSurveysheetResult )
_ , err = e . Table ( "c_surveysheet_result" ) . Where ( "cid = ? and cnr = ? and surveysheetid = ? and lastmodifyby = ?" , t . Cid , t . Cnr , t . Surveysheetid , lastmodifyby ) . Get ( & data . CSurveysheetResult )
if err != nil {
return data , err
}