fix(列表数据调整)

controllers/contract.go

@@ -102,7 +102,7 @@ func (this *ContractCommon) CompanyList() {
 // @Title 合同列表
 // @Description 合同列表接口
 // @Param   ContractType   query   string  false       "合同类型，枚举值：'新签合同','续约合同','补充协议'"
-// @Param   ContractStatus   query   string  false       "合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废'"
+// @Param   Status   query   string  false       "合同状态，枚举值：'待提交','待审批','已撤回','已审批','已驳回','已作废'"
 // @Param   ProductId   query   int  false       "客户类型：传0或者不传为当前账号权限,1 代表是：ficc；2 代表是：权益"
 // @Param   ModifyStartTime   query   string  false       "服务更新时间的选择开始时间，格式：2021-05-23 00:00:00"
 // @Param   ModifyEndTime   query   string  false       "服务更新时间的选择结束时间，格式：2021-05-26 23:59:59"
@@ -114,7 +114,7 @@ func (this *ContractCommon) List() {
 	//合同类型、产品类型、合同状态、更新时间、所选销售
 	//关键字：合同编号、客户名称，社会信用码
 	contractType := this.GetString("ContractType")
-	contractStatus := this.GetString("ContractStatus")
+	status := this.GetString("Status")
 	productId, _ := this.GetInt("ProductId")
 	modifyStartTime := this.GetString("ModifyStartTime")
 	modifyEndTime := this.GetString("ModifyEndTime")
@@ -133,9 +133,9 @@ func (this *ContractCommon) List() {
 		pars = append(pars, contractType)
 	}
 	//合同状态
-	if contractStatus != "" {
+	if status != "" {
 		condition += ` AND status = ? `
-		pars = append(pars, contractStatus)
+		pars = append(pars, status)
 	}
 	//产品类型
 	if productId > 0 {

controllers/contract_approval.go

@@ -186,7 +186,7 @@ func (this *ContractApprovalCommon) List() {
 			list[i].EndDateStr = item.EndDate.Format(utils.FormatDate)
 			list[i].CreateTimeStr = item.CreateTime.Format(utils.FormatDateTime)
 			list[i].ModifyTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
-			if item.Status == "已审批" || item.Status == "已驳回" {
+			if item.ApproveStatus == "已审批" || item.ApproveStatus == "已驳回" {
 				list[i].ApproveTime = item.ModifyTime
 				list[i].ApproveTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
 			}

controllers/seal_approval.go

@@ -197,7 +197,7 @@ func (this *SealApprovalCommon) List() {
 			list[i].CreateTimeStr = item.CreateTime.Format(utils.FormatDateTime)
 			list[i].ModifyTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
 
-			if item.Status == "已审批" || item.Status == "已驳回" {
+			if item.ApproveStatus == "已审批" || item.ApproveStatus == "已驳回" {
 				list[i].ApproveTime = item.ModifyTime
 				list[i].ApproveTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
 			}

models/response/seal/seal.go

@@ -27,7 +27,8 @@ type SealDetailResp struct {
 //合同操作按钮
 type OpButton struct {
 	Approval  bool `description:"是否有审批权限"`
-	Invalid   bool `description:"是否有作废合同权限"`
-	Edit      bool `description:"是否有编辑合同权限"`
-	CheckEdit bool `description:"审核状态下是否有编辑合同权限"`
+	Invalid   bool `description:"是否有作废用印权限"`
+	Edit      bool `description:"是否有编辑用印权限"`
+	CheckEdit bool `description:"审核状态下是否有编辑用印权限"`
+	Cancel    bool `description:"是否有撤回用印权限"`
 }

models/tables/company_approval_message/company_approval_message.go

@@ -90,7 +90,7 @@ func GetCompanyApprovalMessageCount(sysUserId, sourceType int) (count int, err e
 func GetCompanyApprovalMessageList(sysUserId, sourceType, startSize, pageSize int) (items []*CompanyApprovalMessageList, err error) {
 	sql := `SELECT a.*,b.real_name FROM company_approval_message AS a
 			INNER JOIN admin AS b ON a.create_user_id=b.admin_id
-			WHERE receive_user_id=? AND a.operation_status=1 AND message_status !=2 AND a.source_type=? `
+			WHERE receive_user_id=? AND message_status !=2 AND a.source_type=? `
 	sql += ` ORDER BY create_time DESC LIMIT ?,? `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, sysUserId, sourceType, startSize, pageSize).QueryRows(&items)

models/tables/contract/contract.go

@@ -216,8 +216,8 @@ type ContractList struct {
 	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:"合同添加时间"`
+	ModifyTime        time.Time `description:"合同最近一次修改时间"`
+	CreateTime        time.Time `description:"合同添加时间"`
 	ApproveTime       time.Time `description:"审批时间"`
 	InvalidTime       time.Time `description:"作废时间"`
 	CheckBackFileTime time.Time `description:"合同签回时间"`

models/tables/contract_approval/contract_approval.go

@@ -63,7 +63,7 @@ func GetContractApprovalListCount(childCondition, condition, joinCondition strin
 	o := orm.NewOrm()
 	sql := `
 SELECT
-a.contract_approval_id,a.contract_id,a.apply_content,a.contract_detail,a.approve_remark,a.create_time,a.modify_time,a.status,c.status contract_status,c.product_id,
+a.contract_approval_id,a.contract_id,a.apply_content,a.contract_detail,a.approve_remark,a.create_time,a.modify_time,a.status approve_status,c.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
 	join 
 	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
@@ -86,8 +86,8 @@ type ContractApprovalList struct {
 	ContractId               int                     `description:"合同id"`
 	ContractApprovalRecordId int                     `description:"审批流id"`
 	ContractCode             string                  `description:"合同编号"`
-	Status                   string                  `description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
-	ContractStatus           string                  `json:"-";description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
+	Status                   string                  `description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
+	ApproveStatus            string                  `json:"-";description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
 	ApplyContent             string                  `description:"待审内容"`
 	ContractDetail           string                  `json:"-";description:"提交审批时的合同信息；合同快照"`
 	ContractInfo             contract.ContractDetail `json:"-";description:"提交审批时的合同信息；合同快照"`
@@ -122,7 +122,7 @@ func GetContractApprovalList(childCondition, condition, joinCondition string, ch
 	o := orm.NewOrm()
 	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,
+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 approve_status,c.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,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 `
@@ -142,7 +142,7 @@ func GetContractApprovalListCountV2(childCondition, condition string, childPars,
 	o := orm.NewOrm()
 	sql := `
 SELECT
-a.contract_approval_id,a.contract_id,a.apply_content,a.contract_detail,a.approve_remark,a.create_time,a.modify_time,a.status,c.status contract_status,c.product_id,
+a.contract_approval_id,a.contract_id,a.apply_content,a.contract_detail,a.approve_remark,a.create_time,a.modify_time,a.status approve_status,c.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
 	join 
 	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
@@ -162,7 +162,7 @@ func GetContractApprovalListV2(childCondition, condition string, childPars, pars
 	o := orm.NewOrm()
 	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,
+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 approve_status,c.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,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 `
@@ -510,8 +510,8 @@ type SealApprovalList struct {
 	ContractId               int                     `description:"合同id"`
 	ContractApprovalRecordId int                     `description:"审批流id"`
 	ContractCode             string                  `description:"合同编号"`
-	Status                   string                  `description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
-	SealStatus               string                  `json:"-";description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
+	Status                   string                  `description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
+	ApproveStatus            string                  `json:"-";description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
 	ApplyContent             string                  `description:"待审内容"`
 	ContractDetail           string                  `json:"-";description:"提交审批时的合同信息；用印快照"`
 	ContractInfo             contract.ContractDetail `json:"-";description:"提交审批时的合同信息；用印快照"`
@@ -536,7 +536,7 @@ type SealApprovalList struct {
 //获取合同审批列表数据
 func GetSealApprovalList(childCondition, condition, joinCondition 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.approve_time,c.invalid_time,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 approval_status,c.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
@@ -571,7 +571,7 @@ WHERE c.is_delete = 0  AND a.approval_type="seal" `
 }
 func GetSealApprovalListV2(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.approve_time,c.invalid_time,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 approval_status,c.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