准入审批流程

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

@@ -6,7 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/paymentinfo"
-	"dashoo.cn/business2/items"
+	"dashoo.cn/business2/parameter"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -808,11 +808,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	status := ""
 	backstatus := "0"
 	var userIds string
-	if supplierCertEntity.InStyle == "2" {
-		if supplierCertEntity.Status == suppliercert.SECOND_TRIAL_STATUS{
-			supplierCertEntity.Status = "4"
-		}
-	}
+
 	if supplierCertEntity.Status == suppliercert.FEN_TRIAL_STATUS {
 		userIds = firstAudit
 		status = suppliercert.FIRST_TRIAL_STATUS
@@ -841,29 +837,47 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		//}
 		//certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 	} else if supplierCertEntity.Status == suppliercert.SECOND_TRIAL_STATUS {
-		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 
-		//var users []userRole.Base_RoleList
-		//certSrv.GetAuditUser(strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &users)
 		svc := organize.GetOrganizeService(utils.DBE)
 		unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(supplierCertEntity.ThirdAudit))
 		var userlist []userRole.Base_User
 		var setting auditsetting.Base_OilAuditSetting
 		usvc := userRole.GetUserService(utils.DBE)
-		where := "AuditStepCode='" + workflow.PROF_RECE + "'"
-		svc.GetEntity(&setting, where)
 
-		ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
-		tempstr := strings.Join(ids, ",")
-		uids := strings.Replace(tempstr, "uid_", "", -1)
-		uids = strings.Trim(uids, ",")
-		if uids != "" {
-			where := "Id in (" + uids + ")" + " and UnitId=" + unitId
-			svc.GetEntities(&userlist, where)
+		if supplierCertEntity.InStyle == "2" {
+			status = suppliercert.CENT_AUDIT_STATUS
+			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+			usvc.GetEntity(&setting, where)
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+			ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+			tempstr := strings.Join(ids, ",")
+			uids := strings.Replace(tempstr, "uid_", "", -1)
+			uids = strings.Trim(uids, ",")
+			if uids != "" {
+				where := "Id in (" + uids + ")" + " and UnitId=" + topid
+				usvc.GetEntities(&userlist, where)
+			}
+		} else {
+			status = suppliercert.THIRD_TRIAL_STATUS
+			where := "AuditStepCode='" + workflow.PROF_RECE + "'"
+			svc.GetEntity(&setting, where)
+
+			ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+			tempstr := strings.Join(ids, ",")
+			uids := strings.Replace(tempstr, "uid_", "", -1)
+			uids = strings.Trim(uids, ",")
+			if uids != "" {
+				where := "Id in (" + uids + ")" + " and UnitId=" + unitId
+				svc.GetEntities(&userlist, where)
+			}
 		}
 
+		//var users []userRole.Base_RoleList
+		//certSrv.GetAuditUser(strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &users)
+
 
 		for _, tmpUser := range userlist {
 			userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
@@ -875,46 +889,39 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		step = 2
 		backstatus = suppliercert.NO_THIRD_TRIAL_STATUS
 	} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS {
-		status = suppliercert.CENT_AUDIT_STATUS
-		step = 2
-		backstatus = suppliercert.NO_PROF_AUDIT_STATUS
-		////获得有专业审核接收权限的人员
-		//var users1 []userRole.Base_RoleList
-		//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		//users1 = rsvc.GetUserByRole("10000204", this.User.AccCode)
-
-		//var users []suppliercert.UserList
-		//where := "OrganizeId=100000178 and AuditStepCode='" + workflow.PROF_REGULATION + "'"
-		//certSrv.GetEntitysByWhere(OilAuditSettingName,where, &users)
-		dictSvc := items.GetItemsService(utils.DBE)
-		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
+		if supplierCertEntity.InStyle == "3" {
+			userIds = auditer
+			status = suppliercert.PAYING_AUDIT_STATUS
+			step = 3
+			backstatus = suppliercert.NO_CENT_AUDIT_STATUS
+		} else {
+			status = suppliercert.CENT_AUDIT_STATUS
+			step = 2
+			backstatus = suppliercert.NO_PROF_AUDIT_STATUS
+
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+
+			var userlist []userRole.Base_User
+			var setting auditsetting.Base_OilAuditSetting
+			usvc := userRole.GetUserService(utils.DBE)
+			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+			usvc.GetEntity(&setting, where)
+
+			ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+			tempstr := strings.Join(ids, ",")
+			uids := strings.Replace(tempstr, "uid_", "", -1)
+			uids = strings.Trim(uids, ",")
+			if uids != "" {
+				where := "Id in (" + uids + ")" + " and UnitId=" + topid
+				usvc.GetEntities(&userlist, where)
+			}
+			for _, tmpUser := range userlist {
+				userIds += strconv.Itoa(tmpUser.Id) + ","
+			}
 
-		var userlist []userRole.Base_User
-		var setting auditsetting.Base_OilAuditSetting
-		usvc := userRole.GetUserService(utils.DBE)
-		where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
-		usvc.GetEntity(&setting, where)
-
-		ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
-		tempstr := strings.Join(ids, ",")
-		uids := strings.Replace(tempstr, "uid_", "", -1)
-		uids = strings.Trim(uids, ",")
-		if uids != "" {
-			where := "Id in (" + uids + ")" + " and UnitId=" + deptIds[0].Value
-			usvc.GetEntities(&userlist, where)
+			userIds = strings.Trim(userIds, ",")
 		}
-		for _, tmpUser := range userlist {
-			userIds += strconv.Itoa(tmpUser.Id) + ","
-		}
-		//var users []userRole.Base_RoleList
-		//for _, dept := range deptIds {
-		//	certSrv.GetAuditUser(dept.Value, workflow.PROF_REGULATION, &users)
-		//	for _, tmpUser := range users {
-		//		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-		//	}
-		//}
-
-		userIds = strings.Trim(userIds, ",")
 	} else if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
 		userIds = auditer
 		status = suppliercert.PAYING_AUDIT_STATUS
@@ -973,6 +980,16 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					}
 					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 				}
+			} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS {
+				if supplierCertEntity.InStyle == "3" {
+					supplierCertEntity.Status = suppliercert.STOREING_STATUS
+					supplierCertEntity.Step = 3
+					cols := []string{
+						"Status",
+						"Step",
+					}
+					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+				}
 			} else {
 				supplierCertEntity.Status = status
 				supplierCertEntity.Step = step