前后:准入列表显示备注;招标中标结果默认加20年

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -39,7 +39,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sql += ` b.DesignerTotal, `
 	sql += ` b.SkillerTotal, `
 	sql += ` b.Status, `
-	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict`
+	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict,b.Remark`
 	sql += ` from ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
 	sql += ` where ` + where

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

@@ -581,8 +581,8 @@ func (this *QualChangeController) EditQualChange() {
 	}
 }
 
-// @Title 添加资金
-// @Description 添加资金
+// @Title 信息变更添加资质
+// @Description 信息变更添加资质
 // @Success	200	{object}
 // @router /addqualchange/:id [post]
 func (this *QualChangeController) AddQualChange() {
@@ -610,7 +610,7 @@ func (this *QualChangeController) AddQualChange() {
 	svc := qualchange.GetQualChangeService(utils.DBE)
 
 	var supplierfile supplierfile.OilSupplierFile
-	where := "SupplierId = '" + strconv.Itoa(model.SupplierId) + "' and NeedFileType='" + model.NeedFileType + "'"
+	where := "SupplierId = '" + strconv.Itoa(model.SupplierId) + "' and NeedFileType='" + model.NeedFileType + "' and SupplierTypeCode in ( '000', '" + model.SupplierTypeCode + "')"
 	has := svc.GetEntity(&supplierfile, where)
 
 	var tableHeader tableheader.BaseTableheader

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

@@ -4065,6 +4065,9 @@ func (this *OilSupplierController) markLackCertSub(file supplierfile.CheckFile)
 		}
 
 		for _, needHeader := range needList {
+			if needHeader.FileName == "安全资质审查" || needHeader.FileName == "培训考核" {
+				continue
+			}
 			if (supplierEntity.CredentialFlag == "1" || supplierEntity.CredentialFlag == "2") &&
 				strings.Contains(mergerCertSkipField, needHeader.FileName+",") {
 				//三证合一或五证合一的证件，不需要验证了
@@ -4100,6 +4103,9 @@ func (this *OilSupplierController) markLackCertSub(file supplierfile.CheckFile)
 			}
 		}
 		for _, needHeader := range needList1 {
+			if needHeader.FileName == "安全资质审查" || needHeader.FileName == "培训考核" {
+				continue
+			}
 			// 非制造
 			if (supplierEntity.CredentialFlag == "1" || supplierEntity.CredentialFlag == "2") &&
 				strings.Contains(mergerCertSkipField, needHeader.FileName+",") {
@@ -4250,7 +4256,7 @@ func (this *OilSupplierController) GetLackCertSubList() {
 
 	certService := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var allCertList []suppliercert.OilSupplierCert
-	whereCert := " Status = '8' or Status = '11' "
+	whereCert := " (Status = '8' or Status = '11') and (SupplierTypeCode = '02' or SupplierTypeCode = '03') "
 	certService.GetEntitysByWhere(OilSupplierCertName, whereCert, &allCertList)
 	if len(allCertList) > 0 {
 		// 重置标识
@@ -4279,3 +4285,32 @@ func (this *OilSupplierController) GetLackCertSubList() {
 	}
 	log.Println("结束")
 }
+
+// @Title 恢复缺安全资质审查的准入范围
+// @Description 恢复缺安全资质审查的准入范围-06-27
+// @Success 200 {object}
+// @router /recoverCertSub [get]
+func (this *OilSupplierController) RecoverCertSub() {
+	certService := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var allCertList []suppliercert.OilSupplierCert
+	whereCert := " (SupplierTypeCode = '02' or SupplierTypeCode = '03') and LackFileName != '' "
+	certService.GetEntitysByWhere(OilSupplierCertName, whereCert, &allCertList)
+	if len(allCertList) > 0 {
+		log.Println("共查询到准入条数：", len(allCertList))
+		for _, certEntity := range allCertList {
+			var certSub []suppliercertsub.OilSupplierCertSub
+			where1 := "SupplierTypeCode = '" +  certEntity.SupplierTypeCode + "' and SupplierCertId = " + strconv.Itoa(certEntity.Id)
+			certService.GetEntitysByWhere("OilSupplierCertSub2", where1, &certSub)
+			for _, sub := range certSub {
+				var certSubEntity suppliercertsub.OilSupplierCertSub
+				where2 := "SupplierTypeCode = '" +  certEntity.SupplierTypeCode + "' and SupplierCertId = " + strconv.Itoa(certEntity.Id) + " and Name = '" + sub.Name + "'"
+				certService.GetEntityByWhere("OilSupplierCertSub", where2, &certSubEntity)
+				if certSubEntity.Id == 0 {
+					// 插入
+					certService.InsertEntityBytbl("OilSupplierCertSub", &sub)
+				}
+			}
+		}
+	}
+	log.Println("结束")
+}

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist2.vue

@@ -275,7 +275,7 @@
     methods: {
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -1722,7 +1722,7 @@
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -1890,7 +1890,7 @@
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -1654,7 +1654,7 @@ import Viewer from 'v-viewer'
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -2358,7 +2358,7 @@
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -1917,7 +1917,7 @@
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -2106,7 +2106,7 @@
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {
@@ -3115,8 +3115,14 @@
       openDialog (val) {
         this.SubfileForm.Id = val.Id
         if (val.NeedFileType === "招标中标结果") {
+          this.SubfileForm.EffectDate = this.addDate() + "T08:00:00+08:00"
           this.dateDisable = true
         } else {
+          let effectDate = this.jsEffectDate(val.EffectDate)
+          if (effectDate === '') {
+            effectDate = this.jsEffectDate(val.OldEffectDate)
+          }
+          this.SubfileForm.EffectDate = effectDate
           this.dateDisable = false
         }
         this.SubfileForm.SupplierId = val.SupplierId

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -1941,7 +1941,7 @@
       },
       addDate () {
         let date = new Date()
-        let year = date.getFullYear() + 50
+        let year = date.getFullYear() + 20
         let month = date.getMonth() + 1
         let day = date.getDate()
         if (month < 10) {