后端: 增项申请业务处室审批后用户交费前，新增企管法规处审批环节(侯处讲该担责的要担责)

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

@@ -176,6 +176,37 @@ func (this *OilSupplierCertAppendListenerController) PreProfAudit() {
 	this.ServeJSON()
 }
 
+// @Title 企业法规处审批人员列表 --回调
+// @Description get user by token
+// @Success 200 {string} string
+// @router /law-office-auditors [post]
+func (this *OilSupplierCertAppendListenerController) GetLawOfficeAuditors() {
+	var jsonBlob = this.Ctx.Input.RequestBody
+	var listenerApprove ListenerApproveParams
+	json.Unmarshal(jsonBlob, &listenerApprove)
+	appendId := strings.Split(listenerApprove.BusinessKey, "-")[0]
+
+	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+	var certAppendEntity suppliercertappend.OilSupplierCertAppend
+	svc.GetEntityById(appendId, &certAppendEntity)
+	cols := []string{
+		"Id",
+		"Status",
+	}
+	//进入此步骤，记录在数据库中
+	certAppendEntity.Status = suppliercert.LAW_AUDIT_STATUS //企业法规处
+	svc.UpdateEntityByIdCols(appendId, certAppendEntity, cols)
+
+	//查出企业法规处审批的人员
+	stepCode := workflow.PROF_REGULATION //企业法规处
+	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
+	approverIds := auditSettingService.GetApproverIdsByStepCodeForConcentrateAudit(stepCode)
+	var approveInfo ListenerApproveInfo
+	approveInfo.Users = approverIds
+	this.Data["json"] = &approveInfo
+	this.ServeJSON()
+}
+
 // @Title 查询是否交费--回调
 // @Description get user by token
 // @Success 200 {string} string
@@ -223,9 +254,11 @@ func (this *OilSupplierCertAppendListenerController) CheckNeedPay() {
 		var list []suppliercertsub.OilSupplierCertSub
 		total := svc.GetPagingEntitiesWithOrder(1, 10, "CreateOn", false, &list, where)
 		if total <= 50 {
-			log.Print("物资类增项准入范围小于50项, 公司：" + supplierCertAppendEntity.SupplierName + " 增项ID：" + strconv.Itoa(supplierCertAppendEntity.Id))
 			result = 2
 		}
+		log.Print("物资类增项准入范围小于50项, 公司：" + supplierCertAppendEntity.SupplierName + " 增项ID：" + strconv.Itoa(supplierCertAppendEntity.Id) + "增项数目：" + strconv.Itoa(int(total)))
+	} else {
+		log.Println("类别：" + supplierCertAppendEntity.AppendType + "结果：" + strconv.Itoa(result))
 	}
 	if isPay == unPay {
 		// 准入类型是否付费有误！请联系管理员

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

@@ -949,7 +949,7 @@ func (this *OilSupplierCertAppendController) AppendSeparateAuditEntity() {
 	}
 }
 
-// @Title 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+// @Title 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
 // @Description 分办之后的各级审批
 // @Success	200	{object} controllers.Request
 // @router /common-audit/:id [post]
@@ -981,7 +981,7 @@ func (this *OilSupplierCertAppendController) AppendCommonAuditEntity() {
 
 	cols := []string{"AuditDate"}
 	supplierCertAppendEntity.AuditDate = time.Now()
-	certSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &supplierCertAppendEntity, cols, "Id = " + certAppendId)
+	certSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &supplierCertAppendEntity, cols, "Id = "+certAppendId)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
@@ -1169,7 +1169,7 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 	// 审核日期
 	cols := []string{"AuditDate"}
 	supplierCertAppendEntity.AuditDate = time.Now()
-	certAppendSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &supplierCertAppendEntity, cols, "Id = " + id)
+	certAppendSrv.UpdateEntityBywheretbl(OilSupplierCertAppendName, &supplierCertAppendEntity, cols, "Id = "+id)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
@@ -1190,7 +1190,7 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 		svc := supplierfile.GetSupplierfileService(utils.DBE)
 		cols := []string{"SupType"}
 		file.SupType = 3
-		svc.UpdateEntityBywheretbl(OilSupplierFileName, &file, cols, "SupType = 2 and SupplierId = " + strconv.Itoa(supplierCertAppendEntity.SupplierId))
+		svc.UpdateEntityBywheretbl(OilSupplierFileName, &file, cols, "SupType = 2 and SupplierId = "+strconv.Itoa(supplierCertAppendEntity.SupplierId))
 	}
 
 }