fix(合同、用印列表)：新增审批、作废、签回、解约时间调整

controllers/contract_approval.go

@@ -243,16 +243,20 @@ func (this *ContractApprovalCommon) Detail() {
 	}
 
 	//替换快照数据
-	contractDetail.Status = contractInfo.Status
-	contractDetail.FileUrl = contractInfo.FileUrl
-	contractDetail.CheckBackFileUrl = contractInfo.CheckBackFileUrl
+	//contractDetail.Status = contractInfo.Status
+	//contractDetail.FileUrl = contractInfo.FileUrl
+	//contractDetail.CheckBackFileUrl = contractInfo.CheckBackFileUrl
 	//contractDetail.A = contractInfo.CheckBackFileUrl
+	contractInfo.StartDateStr = contractInfo.StartDate.Format(utils.FormatDate)
+	contractInfo.EndDateStr = contractInfo.EndDate.Format(utils.FormatDate)
+	contractInfo.ModifyTimeStr = contractInfo.ModifyTime.Format(utils.FormatDateTime)
+	contractInfo.CreateTimeStr = contractInfo.CreateTime.Format(utils.FormatDateTime)
 
 	//审批操作权限，上传签回文件权限
 	contractOpButton, flowNodeListResp, err := contractService.GetOpButton(contractInfo, contractApprovalInfo, this.AdminWx)
 
 	resp := contractResp.ContractDetailResp{
-		ContractDetail: contractDetail,
+		ContractDetail: contractInfo,
 		FlowNodeList:   flowNodeListResp,
 		OpButton:       contractOpButton,
 	}
@@ -288,12 +292,16 @@ func (this *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId in
 	}
 
 	//替换快照数据
-	detail.Status = contractInfo.Status
+	//detail.Status = contractInfo.Status
+	contractInfo.StartDateStr = contractInfo.StartDate.Format(utils.FormatDate)
+	contractInfo.EndDateStr = contractInfo.EndDate.Format(utils.FormatDate)
+	contractInfo.ModifyTimeStr = contractInfo.ModifyTime.Format(utils.FormatDateTime)
+	contractInfo.CreateTimeStr = contractInfo.CreateTime.Format(utils.FormatDateTime)
 
 	//审批操作权限，上传签回文件权限
 	opButton, flowNodeListResp, err := contractService.GetOpButton(contractInfo, contractApprovalInfo, this.AdminWx)
 	resp := contractResp.ContractDetailResp{
-		ContractDetail: detail,
+		ContractDetail: contractInfo,
 		FlowNodeList:   flowNodeListResp,
 		OpButton:       opButton,
 	}

controllers/seal_approval.go

@@ -255,7 +255,7 @@ func (this *SealApprovalCommon) Detail() {
 	}
 
 	//替换快照数据
-	sealDetail.Status = sealInfo.Status
+	//sealDetail.Status = sealInfo.Status
 
 	//获取审批操作和审批流数据
 	sealOpButton, flowNodeListResp, err := sealService.GetOpButton(sealInfo, contractApprovalInfo, this.AdminWx)
@@ -264,7 +264,7 @@ func (this *SealApprovalCommon) Detail() {
 	}
 
 	resp := sealResp.SealDetailResp{
-		SealDetail:   sealDetail,
+		SealDetail:   sealInfo,
 		FlowNodeList: flowNodeListResp,
 		OpButton:     sealOpButton,
 	}
@@ -308,7 +308,7 @@ func (this *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
 		this.FailWithMessage("获取用印详情失败", "获取用印详情失败，Err:"+err.Error())
 	}
 	resp := sealResp.SealDetailResp{
-		SealDetail:   sealDetail,
+		SealDetail:   sealInfo,
 		FlowNodeList: flowNodeListResp,
 		OpButton:     sealOpButton,
 	}

models/tables/contract/contract.go

@@ -10,39 +10,43 @@ import (
 
 //合同
 type Contract struct {
-	ContractId       int       `orm:"column(contract_id);pk"`
-	ContractCode     string    `description:"合同编号,长度32位"`
-	SellerId         int       `description:"所属销售id"`
-	SellerName       string    `description:"所属销售名称"`
-	ProductId        int       `description:"产品id，1：ficc；2：权益"`
-	ContractType     string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
-	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已签回','已解约'"`
-	StartDate        time.Time `description:"合同开始日期"`
-	EndDate          time.Time `description:"合同结束日期"`
-	OriginalPrice    float64   `description:"合同原金额，优惠前的金额"`
-	Price            float64   `description:"实际金额，优惠后的金额"`
-	PayRemark        string    `description:"付款方式说明,长度255位"`
-	CompanyName      string    `description:"客户名称，甲方名称,长度32位"`
-	CreditCode       string    `description:"社会统一信用代码,长度64位"`
-	ProvinceId       int       `description:"省级id"`
-	Province         string    `description:"省级名称,长度16位"`
-	CityId           int       `description:"市级id"`
-	City             string    `description:"市级名称,长度32位"`
-	Address          string    `description:"详细地址"`
-	Fax              string    `description:"传真,长度32位"`
-	Phone            string    `description:"电话,长度32位"`
-	Postcode         string    `description:"邮编,长度16位"`
-	Remark           string    `description:"补充内容,长度255位"`
-	ModifyContent    string    `description:"修改内容"`
-	ApprovalRemark   string    `description:"审核备注"`
-	FileUrl          string    `description:"合同文件地址"`
-	CheckBackFileUrl string    `description:"签回合同文件地址"`
-	RescindFileUrl   string    `description:"解约合同文件地址"`
-	TemplateId       int       `description:"模板id"`
-	SourceId         int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
-	IsDelete         int       `description:"是否已经删除，0：未删除，1：已删除",json:"-"`
-	ModifyTime       time.Time `description:"合同最近一次修改时间"`
-	CreateTime       time.Time `description:"合同添加时间"`
+	ContractId        int       `orm:"column(contract_id);pk"`
+	ContractCode      string    `description:"合同编号,长度32位"`
+	SellerId          int       `description:"所属销售id"`
+	SellerName        string    `description:"所属销售名称"`
+	ProductId         int       `description:"产品id，1：ficc；2：权益"`
+	ContractType      string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
+	Status            string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已签回','已解约'"`
+	StartDate         time.Time `description:"合同开始日期"`
+	EndDate           time.Time `description:"合同结束日期"`
+	OriginalPrice     float64   `description:"合同原金额，优惠前的金额"`
+	Price             float64   `description:"实际金额，优惠后的金额"`
+	PayRemark         string    `description:"付款方式说明,长度255位"`
+	CompanyName       string    `description:"客户名称，甲方名称,长度32位"`
+	CreditCode        string    `description:"社会统一信用代码,长度64位"`
+	ProvinceId        int       `description:"省级id"`
+	Province          string    `description:"省级名称,长度16位"`
+	CityId            int       `description:"市级id"`
+	City              string    `description:"市级名称,长度32位"`
+	Address           string    `description:"详细地址"`
+	Fax               string    `description:"传真,长度32位"`
+	Phone             string    `description:"电话,长度32位"`
+	Postcode          string    `description:"邮编,长度16位"`
+	Remark            string    `description:"补充内容,长度255位"`
+	ModifyContent     string    `description:"修改内容"`
+	ApprovalRemark    string    `description:"审核备注"`
+	FileUrl           string    `description:"合同文件地址"`
+	CheckBackFileUrl  string    `description:"签回合同文件地址"`
+	RescindFileUrl    string    `description:"解约合同文件地址"`
+	TemplateId        int       `description:"模板id"`
+	SourceId          int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
+	IsDelete          int       `description:"是否已经删除，0：未删除，1：已删除",json:"-"`
+	ApproveTime       time.Time `description:"审批时间"`
+	InvalidTime       time.Time `description:"作废时间"`
+	CheckBackFileTime time.Time `description:"合同签回时间"`
+	RescindTime       time.Time `description:"解约时间"`
+	ModifyTime        time.Time `description:"合同最近一次修改时间"`
+	CreateTime        time.Time `description:"合同添加时间"`
 }
 
 //更新合同基础信息
@@ -62,46 +66,54 @@ func GetContractById(contractId int) (contractInfo *Contract, err error) {
 
 //合同详情信息（包含服务信息等）
 type ContractDetail struct {
-	ContractId       int       `description:"合同唯一id"`
-	ContractCode     string    `description:"合同编号,长度32位"`
-	SellerId         int       `description:"所属销售id"`
-	SellerName       string    `description:"所属销售名称"`
-	ProductId        int       `description:"产品id，1：ficc；2：权益"`
-	ContractType     string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
-	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已解约'"`
-	StartDate        time.Time `description:"合同开始日期"`
-	EndDate          time.Time `description:"合同结束日期"`
-	OriginalPrice    float64   `description:"合同原金额，优惠前的金额"`
-	Price            float64   `description:"实际金额，优惠后的金额"`
-	PayRemark        string    `description:"付款方式说明,长度255位"`
-	CompanyName      string    `description:"客户名称，甲方名称,长度32位"`
-	CreditCode       string    `description:"社会统一信用代码,长度64位"`
-	ProvinceId       int       `description:"省级id"`
-	Province         string    `description:"省级名称,长度16位"`
-	CityId           int       `description:"市级id"`
-	City             string    `description:"市级名称,长度32位"`
-	Address          string    `description:"详细地址"`
-	Fax              string    `description:"传真,长度32位"`
-	Phone            string    `description:"电话,长度32位"`
-	Postcode         string    `description:"邮编,长度16位"`
-	Remark           string    `description:"补充内容,长度255位"`
-	SellerRemark     string    `description:"销售备注,长度255位"`
-	ModifyContent    string    `description:"修改内容"`
-	ApprovalRemark   string    `description:"审核备注"`
-	FileUrl          string    `description:"合同文件地址"`
-	CheckBackFileUrl string    `description:"签回合同文件地址"`
-	RescindFileUrl   string    `description:"解约合同文件地址"`
-	TemplateId       int       `description:"模板id"`
-	SourceId         int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
-	IsDelete         int       `json:"-";description:"是否已经删除，0：未删除，1：已删除"`
-	ModifyTime       time.Time `description:"合同最近一次修改时间"`
-	CreateTime       time.Time `description:"合同添加时间"`
+	ContractId        int       `description:"合同唯一id"`
+	ContractCode      string    `description:"合同编号,长度32位"`
+	SellerId          int       `description:"所属销售id"`
+	SellerName        string    `description:"所属销售名称"`
+	ProductId         int       `description:"产品id，1：ficc；2：权益"`
+	ContractType      string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
+	Status            string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废','已解约'"`
+	StartDate         time.Time `description:"合同开始日期"`
+	EndDate           time.Time `description:"合同结束日期"`
+	OriginalPrice     float64   `description:"合同原金额，优惠前的金额"`
+	Price             float64   `description:"实际金额，优惠后的金额"`
+	PayRemark         string    `description:"付款方式说明,长度255位"`
+	CompanyName       string    `description:"客户名称，甲方名称,长度32位"`
+	CreditCode        string    `description:"社会统一信用代码,长度64位"`
+	ProvinceId        int       `description:"省级id"`
+	Province          string    `description:"省级名称,长度16位"`
+	CityId            int       `description:"市级id"`
+	City              string    `description:"市级名称,长度32位"`
+	Address           string    `description:"详细地址"`
+	Fax               string    `description:"传真,长度32位"`
+	Phone             string    `description:"电话,长度32位"`
+	Postcode          string    `description:"邮编,长度16位"`
+	Remark            string    `description:"补充内容,长度255位"`
+	SellerRemark      string    `description:"销售备注,长度255位"`
+	ModifyContent     string    `description:"修改内容"`
+	ApprovalRemark    string    `description:"审核备注"`
+	FileUrl           string    `description:"合同文件地址"`
+	CheckBackFileUrl  string    `description:"签回合同文件地址"`
+	RescindFileUrl    string    `description:"解约合同文件地址"`
+	TemplateId        int       `description:"模板id"`
+	SourceId          int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
+	IsDelete          int       `json:"-";description:"是否已经删除，0：未删除，1：已删除"`
+	ModifyTime        time.Time `description:"合同最近一次修改时间"`
+	CreateTime        time.Time `description:"合同添加时间"`
+	ApproveTime       time.Time `description:"审批时间"`
+	InvalidTime       time.Time `description:"作废时间"`
+	CheckBackFileTime time.Time `description:"合同签回时间"`
+	RescindTime       time.Time `description:"解约时间"`
 
-	StartDateStr  string `description:"合同起始时间"`
-	EndDateStr    string `description:"合同结束时间"`
-	ModifyTimeStr string `description:"最近一次更新时间"`
-	CreateTimeStr string `description:"合同添加时间"`
-	Service       []*contract.ContractServiceAndDetail
+	StartDateStr         string `description:"合同起始时间"`
+	EndDateStr           string `description:"合同结束时间"`
+	ModifyTimeStr        string `description:"最近一次更新时间"`
+	CreateTimeStr        string `description:"合同添加时间"`
+	ApproveTimeStr       string `description:"审批时间"`
+	InvalidTimeStr       string `description:"作废时间"`
+	CheckBackFileTimeStr string `description:"合同签回时间"`
+	RescindTimeStr       string `description:"解约时间"`
+	Service              []*contract.ContractServiceAndDetail
 }
 
 //根据合同id获取合同详情信息
@@ -172,46 +184,54 @@ func AddContract(contractInfo *Contract, contractServiceAndDetailList []*contrac
 }
 
 type ContractList struct {
-	ContractId       int       `description:"合同唯一id"`
-	ContractCode     string    `description:"合同编号,长度32位"`
-	SellerId         int       `description:"所属销售id"`
-	SellerName       string    `description:"所属销售名称"`
-	ProductId        int       `description:"产品id，1：ficc；2：权益"`
-	ContractType     string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
-	Status           string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废'"`
-	StartDate        time.Time `json:"-";description:"合同开始日期"`
-	EndDate          time.Time `json:"-";description:"合同结束日期"`
-	OriginalPrice    float64   `description:"合同原金额，优惠前的金额"`
-	Price            float64   `description:"实际金额，优惠后的金额"`
-	PayRemark        string    `description:"付款方式说明,长度255位"`
-	CompanyName      string    `description:"客户名称，甲方名称,长度32位"`
-	UseCompanyName   string    `description:"使用方名称，长度32位"`
-	CreditCode       string    `description:"社会统一信用代码,长度64位"`
-	ProvinceId       int       `description:"省级id"`
-	Province         string    `description:"省级名称,长度16位"`
-	CityId           int       `description:"市级id"`
-	City             string    `description:"市级名称,长度32位"`
-	Address          string    `description:"详细地址"`
-	Fax              string    `description:"传真,长度32位"`
-	Phone            string    `description:"电话,长度32位"`
-	Postcode         string    `description:"邮编,长度16位"`
-	Remark           string    `json:"-";description:"补充内容,长度255位"`
-	SellerRemark     string    `description:"销售备注,长度255位"`
-	ApprovalRemark   string    `description:"审核备注"`
-	ModifyContent    string    `description:"修改内容"`
-	FileUrl          string    `description:"合同文件地址"`
-	CheckBackFileUrl string    `description:"签回合同文件地址"`
-	TemplateId       int       `description:"模板id"`
-	SourceId         int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
-	IsDelete         int       `json:"-";description:"是否已经删除，0：未删除，1：已删除"`
-	ModifyTime       time.Time `json:"-";description:"合同最近一次修改时间"`
-	CreateTime       time.Time `json:"-";description:"合同添加时间"`
+	ContractId        int       `description:"合同唯一id"`
+	ContractCode      string    `description:"合同编号,长度32位"`
+	SellerId          int       `description:"所属销售id"`
+	SellerName        string    `description:"所属销售名称"`
+	ProductId         int       `description:"产品id，1：ficc；2：权益"`
+	ContractType      string    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
+	Status            string    `description:"合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废'"`
+	StartDate         time.Time `json:"-";description:"合同开始日期"`
+	EndDate           time.Time `json:"-";description:"合同结束日期"`
+	OriginalPrice     float64   `description:"合同原金额，优惠前的金额"`
+	Price             float64   `description:"实际金额，优惠后的金额"`
+	PayRemark         string    `description:"付款方式说明,长度255位"`
+	CompanyName       string    `description:"客户名称，甲方名称,长度32位"`
+	UseCompanyName    string    `description:"使用方名称，长度32位"`
+	CreditCode        string    `description:"社会统一信用代码,长度64位"`
+	ProvinceId        int       `description:"省级id"`
+	Province          string    `description:"省级名称,长度16位"`
+	CityId            int       `description:"市级id"`
+	City              string    `description:"市级名称,长度32位"`
+	Address           string    `description:"详细地址"`
+	Fax               string    `description:"传真,长度32位"`
+	Phone             string    `description:"电话,长度32位"`
+	Postcode          string    `description:"邮编,长度16位"`
+	Remark            string    `json:"-";description:"补充内容,长度255位"`
+	SellerRemark      string    `description:"销售备注,长度255位"`
+	ApprovalRemark    string    `description:"审核备注"`
+	ModifyContent     string    `description:"修改内容"`
+	FileUrl           string    `description:"合同文件地址"`
+	CheckBackFileUrl  string    `description:"签回合同文件地址"`
+	TemplateId        int       `description:"模板id"`
+	SourceId          int       `description:"来源合同id，默认是0；如果是通过其他合同复制过来的，那么就是原合同的id"`
+	IsDelete          int       `json:"-";description:"是否已经删除，0：未删除，1：已删除"`
+	ModifyTime        time.Time `json:"-";description:"合同最近一次修改时间"`
+	CreateTime        time.Time `json:"-";description:"合同添加时间"`
+	ApproveTime       time.Time `description:"审批时间"`
+	InvalidTime       time.Time `description:"作废时间"`
+	CheckBackFileTime time.Time `description:"合同签回时间"`
+	RescindTime       time.Time `description:"解约时间"`
 
-	StartDateStr  string `description:"合同起始时间"`
-	EndDateStr    string `description:"合同结束时间"`
-	ModifyTimeStr string `description:"最近一次更新时间"`
-	CreateTimeStr string `description:"合同添加时间"`
-	Service       []*contract.ContractServiceAndDetail
+	StartDateStr         string `description:"合同起始时间"`
+	EndDateStr           string `description:"合同结束时间"`
+	ModifyTimeStr        string `description:"最近一次更新时间"`
+	CreateTimeStr        string `description:"合同添加时间"`
+	ApproveTimeStr       string `description:"审批时间"`
+	InvalidTimeStr       string `description:"作废时间"`
+	CheckBackFileTimeStr string `description:"合同签回时间"`
+	RescindTimeStr       string `description:"解约时间"`
+	Service              []*contract.ContractServiceAndDetail
 }
 
 //获取合同列表数据数量
@@ -345,8 +365,9 @@ func InvalidContract(contractInfo *Contract) (err error) {
 
 	contractInfo.Status = "已作废"
 	contractInfo.ModifyTime = time.Now()
+	contractInfo.InvalidTime = time.Now()
 	//合同数据入库
-	_, err = o.Update(contractInfo, "Status", "ModifyTime")
+	_, err = o.Update(contractInfo, "Status", "ModifyTime", "InvalidTime")
 	if err != nil {
 		return
 	}

models/tables/contract_approval/contract_approval.go

@@ -104,11 +104,17 @@ type ContractApprovalList struct {
 	CreateTime               time.Time               `description:"发起审批的时间"`
 	ModifyTime               time.Time               `description:"最后一次修改的时间"`
 	ApproveTime              time.Time               `description:"审批时间"`
+	InvalidTime              time.Time               `description:"作废时间"`
+	CheckBackFileTime        time.Time               `description:"合同签回时间"`
+	RescindTime              time.Time               `description:"解约时间"`
 	StartDateStr             string                  `description:"合同开始日期(字符串类型)"`
 	EndDateStr               string                  `description:"合同结束日期(字符串类型)"`
 	CreateTimeStr            string                  `description:"发起审批的时间(字符串类型)"`
 	ModifyTimeStr            string                  `description:"最后一次修改的时间(字符串类型)"`
 	ApproveTimeStr           string                  `description:"审批时间（字符串类型）"`
+	InvalidTimeStr           string                  `description:"作废时间（字符串类型）"`
+	CheckBackFileTimeStr     string                  `description:"合同签回时间（字符串类型）"`
+	RescindTimeStr           string                  `description:"解约时间（字符串类型）"`
 }
 
 //获取合同审批列表数据
@@ -117,7 +123,7 @@ func GetContractApprovalList(childCondition, condition string, childPars, pars [
 	sql := `
 SELECT
 a.contract_approval_id,d.contract_approval_record_id,a.contract_id,a.apply_content,a.approve_remark,a.create_time,a.modify_time,a.status,c.status contract_status,c.product_id,
-c.contract_type,c.start_date,c.end_date,c.price,c.company_name,c.seller_id,c.seller_name,c.file_url,c.contract_code from contract_approval a
+c.contract_type,c.start_date,c.end_date,c.price,c.company_name,c.seller_id,c.seller_name,c.file_url,c.contract_code,c.approve_time,c.invalid_time,c.check_back_file_time,c.rescind_time from contract_approval a
 	join 
 	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
 	sql += childCondition
@@ -274,11 +280,11 @@ func (ContractApproval) Reject(contractApprovalInfo *ContractApproval, contractA
 	switch contractApprovalInfo.ApprovalType {
 	case "contract":
 		//修改合同状态为已驳回
-		sql := `UPDATE contract SET status="已驳回",modify_content="",approval_remark=?,modify_time=NOW() WHERE contract_id = ?`
+		sql := `UPDATE contract SET status="已驳回",modify_content="",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE contract_id = ?`
 		_, err = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 	case "seal":
 		//修改用印状态为已驳回
-		sql := `UPDATE seal SET status="已驳回",approval_remark=?,modify_time=NOW() WHERE seal_id = ?`
+		sql := `UPDATE seal SET status="已驳回",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE seal_id = ?`
 		_, err = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 	}
 	return
@@ -329,7 +335,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 		switch contractApprovalInfo.ApprovalType {
 		case "contract":
 			//修改合同状态为已审批
-			sql := `UPDATE contract SET status="已审批",approval_remark=?,modify_time=NOW() WHERE contract_id = ?`
+			sql := `UPDATE contract SET status="已审批",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE contract_id = ?`
 			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr
@@ -337,7 +343,7 @@ func (ContractApproval) Approved(contractApprovalInfo *ContractApproval, contrac
 			}
 		case "seal":
 			//修改用印状态为已审批
-			sql := `UPDATE seal SET status="已审批",approval_remark=?,modify_time=NOW() WHERE seal_id = ?`
+			sql := `UPDATE seal SET status="已审批",approval_remark=?,approve_time=NOW(),modify_time=NOW() WHERE seal_id = ?`
 			_, tmpErr = o.Raw(sql, remark, contractApprovalInfo.ContractId).Exec()
 			if tmpErr != nil {
 				err = tmpErr
@@ -478,18 +484,19 @@ type SealApprovalList struct {
 	CreateTime               time.Time               `description:"发起审批的时间"`
 	ModifyTime               time.Time               `description:"最后一次修改的时间"`
 	ApproveTime              time.Time               `description:"审批时间"`
+	InvalidTime              time.Time               `description:"作废时间"`
 	StartDateStr             string                  `description:"合同开始日期(字符串类型)"`
 	EndDateStr               string                  `description:"合同结束日期(字符串类型)"`
 	CreateTimeStr            string                  `description:"发起审批的时间(字符串类型)"`
 	ModifyTimeStr            string                  `description:"最后一次修改的时间(字符串类型)"`
 	ApproveTimeStr           string                  `description:"审批时间（字符串类型）"`
+	InvalidTimeStr           string                  `description:"作废时间（字符串类型）"`
 }
 
 //获取合同审批列表数据
 func GetSealApprovalList(childCondition, condition string, childPars, pars []interface{}, startSize, pageSize int) (list []*SealApprovalList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,a.create_time,a.modify_time,a.status,c.status seal_status,
-c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.code from contract_approval a
+	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,a.create_time,a.modify_time,a.status,c.status seal_status,c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.approve_time,c.invalid_time,c.code from contract_approval a
 	join 
 	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
 	sql += childCondition

models/tables/seal/seal.go

@@ -26,6 +26,8 @@ type Seal struct {
 	FileNum        int       `description:"文件附件份数"`
 	ContractId     int       `description:"系统合同id"`
 	IsDelete       int       `description:"是否已经删除，0：未删除，1：已删除",json:"-"`
+	ApproveTime    time.Time `description:"审批时间"`
+	InvalidTime    time.Time `description:"作废时间"`
 	ModifyTime     time.Time `description:"最近一次修改时间"`
 	CreateTime     time.Time `description:"添加时间"`
 }
@@ -69,8 +71,9 @@ func DeleteSeal(sealInfo *Seal) (err error) {
 func Invalid(sealInfo *Seal) (err error) {
 	sealInfo.Status = "已作废"
 	sealInfo.ModifyTime = time.Now()
+	sealInfo.InvalidTime = time.Now()
 	//修改用印数据入库
-	err = sealInfo.Update([]string{"Status", "ModifyTime"})
+	err = sealInfo.Update([]string{"Status", "ModifyTime", "InvalidTime"})
 	return
 }
 

services/contract/contract.go

@@ -95,7 +95,8 @@ func UploadCheckBackFile(contractId int, fileUrl string, opUser *custom.AdminWx)
 	contractInfo.CheckBackFileUrl = fileUrl
 	contractInfo.Status = "已签回"
 	contractInfo.ModifyTime = time.Now()
-	err = contractInfo.Update([]string{"CheckBackFileUrl", "Status", "ModifyTime"})
+	contractInfo.CheckBackFileTime = time.Now()
+	err = contractInfo.Update([]string{"CheckBackFileUrl", "Status", "ModifyTime", "CheckBackFileTime"})
 	if err != nil {
 		return
 	}