冲突解决

src/dashoo.cn/backend/api/controllers/base.go

@@ -243,6 +243,8 @@ var (
 	OilTechsrvDetailViewName                 string = "oil_techsrv_detail_view"     //技术服务类视图
 	OilGoodsAptDetailViewName                string = "oil_goodsapt_detail_view"    //物資类视图
 	OilClassOrgSettingName                   string = "OilClassOrgSetting"          //分类部门审批配置表
+	OilAnnualAuditName                       string = "OilAnnualAudit"              //年审表
+	OilSupplierOpinionName                   string = "OilSupplierOpinion"              //追加意见表
 )
 
 //分页信息及数据

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -40,7 +40,6 @@ func (this *OilSupplierCertAppendController) GetList() {
 	WorkRange := this.GetString("WorkRange")
 	DenyReason := this.GetString("DenyReason")
 	AuditDate := this.GetString("AuditDate")
-	Status := this.GetString("Status")
 	Remark := this.GetString("Remark")
 	CreateOn := this.GetString("CreateOn")
 
@@ -68,10 +67,6 @@ func (this *OilSupplierCertAppendController) GetList() {
 		where = where + " and AuditDate like '%" + AuditDate + "%'"
 	}
 
-	if Status != "" {
-		where = where + " and Status like '%" + Status + "%'"
-	}
-
 	if Remark != "" {
 		where = where + " and Remark like '%" + Remark + "%'"
 	}