merge auditsetting

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -6,12 +6,13 @@ import (
 	"dashoo.cn/backend/api/business/limsdataentry"
 	"dashoo.cn/backend/api/business/limsdoctemplate"
 	"dashoo.cn/backend/api/business/workflow"
+
 	//"fmt"
 	"strconv"
 	"strings"
 
-	"dashoo.cn/business2/userRole"
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
@@ -84,18 +85,18 @@ func (s *LimsBalanceService) GetBalanceInfoWithCustomor(balance string, entrust
 	return
 }
 
-func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string,DeptID string, LimsTaskBalanceName string, LimsDocTemplateName string,
-													LimsDocTemplateDetailName string, LimsDateEntryName string,LimsEntrustMainName string, balanceid int,departartmentId string,Eid string) error {
+func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string, DeptID string, LimsTaskBalanceName string, LimsDocTemplateName string,
+	LimsDocTemplateDetailName string, LimsDateEntryName string, LimsEntrustMainName string, balanceid int, departartmentId string, Eid string) error {
 	var err error
 	//获取TemplateCode
 	svc := limsdataentry.GetLimsDataEntryService(utils.DBE)
 	var templatedata []limsdataentry.LimsDocTemplateModel
 	var balancedata limsdataentry.LimsTaskBalance
 	var entrustmaindata limsdataentry.LimsEntrustMain
-	where := "Id = "+ utils.ToStr(balanceid)
-	enwhere :=  "Id = "+ Eid
-	svc.GetEntityByWhere(AccCode+LimsTaskBalanceName,where,&balancedata)
-	svc.GetEntityByWhere(AccCode+LimsEntrustMainName,enwhere,&entrustmaindata)
+	where := "Id = " + utils.ToStr(balanceid)
+	enwhere := "Id = " + Eid
+	svc.GetEntityByWhere(AccCode+LimsTaskBalanceName, where, &balancedata)
+	svc.GetEntityByWhere(AccCode+LimsEntrustMainName, enwhere, &entrustmaindata)
 	orderby := "b.Id desc"
 	where2 := " b.Id= " + utils.ToStr(balancedata.DataDocId)
 	templatedata = svc.GetPagingTemplateSerch(AccCode+LimsDocTemplateName, AccCode+LimsDocTemplateDetailName, orderby, where2)
@@ -233,26 +234,26 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 		dataentryentity.DocId = balancedata.DataDocId
 		dataentryentity.DocType = balancedata.DataDoc
 		dataentryentity.DocAddress = fileurl[0]
-		dataentryentity.EId =entrustmaindata.Id
+		dataentryentity.EId = entrustmaindata.Id
 		dataentryentity.CustomerId = entrustmaindata.CustomerId
-		dataentryentity.CustomerName= entrustmaindata.CustomerName
+		dataentryentity.CustomerName = entrustmaindata.CustomerName
 		dataentryentity.PositionCheck = entrustmaindata.AddressName
 		dataentryentity.PositionCheckId = entrustmaindata.AddressId
 		dataentryentity.DocName = fileurl[1]
 		dataentryentity.DocVersion = "v1"
 		dataentryentity.CheckStatus = 0
 		dataentryentity.CreateBy = ConUserList[i]
-		dataentryentity.CreateUserId , _ = utils.StrTo(ConUserIdList[i]).Int()
+		dataentryentity.CreateUserId, _ = utils.StrTo(ConUserIdList[i]).Int()
 		_, err = svc.InsertEntityBytbl(AccCode+LimsDateEntryName, &dataentryentity)
 		//启动数据录入工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var processInstanceId string
-		var RoleSet auditsetting.BaseOilAuditSetting
+		var RoleSet auditsetting.Base_OilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting",DeptID,workflow.DATAAUDIT, &RoleSet)
+		rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting", DeptID, workflow.DATAAUDIT, &RoleSet)
 		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 
-		dataentryentity.DocKey=processInstanceId
+		dataentryentity.DocKey = processInstanceId
 		err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})
 	}
 	return err

src/dashoo.cn/backend/api/business/limscreatereport/limscreatereportService.go

@@ -1,9 +1,10 @@
 package limscreatereport
 
 import (
-	"dashoo.cn/backend/api/business/auditsetting"
 	"strings"
 
+	"dashoo.cn/backend/api/business/auditsetting"
+
 	"dashoo.cn/backend/api/business/limsdataentry"
 
 	"fmt"
@@ -166,7 +167,7 @@ func (s *CreateReportService) GetReportUrl(reporttable string, historytable stri
 	return List
 }
 
-func (this *CreateReportService) CreateDataentry(DeptID string,AccCode string, taskbalancename string, entrustname string, dataentryname string,docname string,docdetailname string, reportmodel LimsCreateReport, DataEntryCode string, departartmentId string,RecheckUserId string,ReCheckUser string) (int,int) {
+func (this *CreateReportService) CreateDataentry(DeptID string, AccCode string, taskbalancename string, entrustname string, dataentryname string, docname string, docdetailname string, reportmodel LimsCreateReport, DataEntryCode string, departartmentId string, RecheckUserId string, ReCheckUser string) (int, int) {
 	var err error
 	//获取TemplateCode
 	svc := limsdataentry.GetLimsDataEntryService(utils.DBE)
@@ -203,9 +204,9 @@ func (this *CreateReportService) CreateDataentry(DeptID string,AccCode string, t
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.BaseOilAuditSetting
+	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting",DeptID,workflow.DATAAUDIT, &RoleSet)
+	rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting", DeptID, workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), RecheckUserId)
 	//switch departartmentId {
 	//case "100000150":
@@ -216,5 +217,5 @@ func (this *CreateReportService) CreateDataentry(DeptID string,AccCode string, t
 	dataentryentity.DocKey = processInstanceId
 	err = this.UpdateEntityBytbl(dataentryname, dataentryentity.Id, &dataentryentity, []string{"DocKey"})
 	fmt.Println(err)
-	return dataentryentity.Id,dataentryentity.TaskId
+	return dataentryentity.Id, dataentryentity.TaskId
 }

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

@@ -229,7 +229,6 @@ var (
 	LimsReportSignName                       string = "LimsReportSign"              //报告签发
 	LimsReportHistoryName                    string = "LimsReportHistory"           //报告历史
 	LimsCustomerpositionName                 string = "LimsCustomerPosition"
-<<<<<<< HEAD
 	LimsPressureLeakName                     string = "LimsPressureLeak"               //阻火器压力损失表
 	LimsSpecifyStandardName                  string = "LimsSpecifyStandard"            //Lims规格型号标准
 	BaseUserName                             string = "Base_User"                      //用户表
@@ -255,15 +254,6 @@ var (
 	OilAuditSettingName                      string = "Base_OilAuditSetting"           // 单位审批步骤自定义配置
 	LimsReportDrillCollarName                string = "LimsReportDrillCollar"          //  石油专用管材方钻杆检验记录
 	LimsPetroleUmPipeName                    string = "LimsReportPetroleumPipe"              //  石油专用管材钻铤检验记录
-
-=======
-	LimsPressureLeakName                     string = "LimsPressureLeak"    //阻火器压力损失表
-	LimsSpecifyStandardName                  string = "LimsSpecifyStandard" //Lims规格型号标准
-	BaseUserName                             string = "Base_User"           //用户表
-	UserQualificationName                    string = "UserQualification"   //用户资质表
-	LimsInstrumentGroup                      string = "LimsInstrumentGroup" // 检测仪器关联
-	OilAuditSettingName                          string = "Base_OilAuditSetting" // 单位审批步骤自定义配置
->>>>>>> upstream/master
 )
 
 //分页信息及数据

src/dashoo.cn/backend/api/controllers/lims/limscreatereport.go

@@ -1,8 +1,6 @@
 package lims
 
 import (
-	"dashoo.cn/backend/api/business/auditsetting"
-	"dashoo.cn/backend/api/business/limscreatereport"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -12,14 +10,17 @@ import (
 	"strings"
 	"time"
 
-	"dashoo.cn/business2/organize"
-	"dashoo.cn/business2/userRole"
+	"dashoo.cn/backend/api/business/auditsetting"
+	"dashoo.cn/backend/api/business/limscreatereport"
+
 	"dashoo.cn/backend/api/business/codecsequence"
 	"dashoo.cn/backend/api/business/limsbalance"
 	"dashoo.cn/backend/api/business/limsdataentry"
 	"dashoo.cn/backend/api/business/limsdoctemplate"
 	"dashoo.cn/backend/api/business/limsentrust"
 	"dashoo.cn/backend/api/business/workflow"
+	"dashoo.cn/business2/organize"
+	"dashoo.cn/business2/userRole"
 	"github.com/360EntSecGroup-Skylar/excelize"
 	. "github.com/linxGnu/goseaweedfs"
 
@@ -138,9 +139,9 @@ func (this *CreateReportController) GetCreateReportToDoList() {
 	//工作流获取代办事务
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.BaseOilAuditSetting
+	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTAUDIT, &RoleSet)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.REPORTAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
 	//switch this.User.DepartmentId {
 	//case "100000150":
@@ -420,7 +421,7 @@ func (this *CreateReportController) DataToExcelReport() {
 // @Success	200	{object} controllers.Request
 // @router /recheck/[post]
 func (this *CreateReportController) Recheck() {
-	ReCheckUser :=  this.GetString("ReCheckUser")
+	ReCheckUser := this.GetString("ReCheckUser")
 	RecheckUserId := this.GetString("ReCheckUserId")
 	var jsonblob = this.Ctx.Input.RequestBody
 	var errinfo ErrorDataInfo
@@ -446,14 +447,14 @@ func (this *CreateReportController) Recheck() {
 	svc := limscreatereport.GetCreateReportService(utils.DBE)
 	var dataentrylist []limsdataentry.LimsDateEntry
 	svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, "EId = '"+utils.ToStr(reportmodel.EId)+"'", &dataentrylist)
-	dataentryId,TaskId:=svc.CreateDataentry(this.User.DepartmentId, this.User.AccCode, this.User.AccCode+LimsTaskBalanceName, this.User.AccCode+LimsEntrustMainName, this.User.AccCode+LimsDateEntryName,this.User.AccCode+LimsDocTemplateName,this.User.AccCode+LimsDocTemplateDetailName, reportmodel, dataentrylist[0].DataEntryCode, this.User.DepartmentId,RecheckUserId,ReCheckUser)
+	dataentryId, TaskId := svc.CreateDataentry(this.User.DepartmentId, this.User.AccCode, this.User.AccCode+LimsTaskBalanceName, this.User.AccCode+LimsEntrustMainName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsDocTemplateName, this.User.AccCode+LimsDocTemplateDetailName, reportmodel, dataentrylist[0].DataEntryCode, this.User.DepartmentId, RecheckUserId, ReCheckUser)
 	//新增数据录入记录 开始工作流
 	//更新报告状态
 	var emptyEntity limscreatereport.LimsCreateReport
 	emptyEntity.ReportStatus = 5
 	svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, reportmodel.Id, &emptyEntity, []string{"ReportStatus"})
 	//不合格的录入数据写入新生成的数据录入
-	switch  docTemplate.TemplateCode {
+	switch docTemplate.TemplateCode {
 	//防雷装置报告
 	case limsdoctemplate.DAYT_LIGHTPROTECT_REPORT:
 		var lplist []limsreportlp.LimsReportLightProtect
@@ -536,7 +537,7 @@ func (this *CreateReportController) Recheck() {
 	case limsdoctemplate.DAYT_ELECGROUND_REPORT:
 		var eglist []limsreportelecground.LimsReportElecGround
 		egwhere := "EId = '" + utils.ToStr(reportmodel.EId) + "' and CheckResult = '×'"
-		svc.GetEntitysByWhere( this.User.AccCode+LimsReportElecGroundName, egwhere, &eglist)
+		svc.GetEntitysByWhere(this.User.AccCode+LimsReportElecGroundName, egwhere, &eglist)
 		if len(eglist) == 0 {
 			var errinfo ErrorDataInfo
 			errinfo.Message = "数据为空"
@@ -610,8 +611,8 @@ func (this *CreateReportController) Recheck() {
 				}
 			}
 		}
-		}
 	}
+}
 
 // @Title 生成报告
 // @Description 选中多条记录生成报告
@@ -743,9 +744,9 @@ func (this *CreateReportController) ReportCreateThen(reportUrl string, UnHGRepor
 		}
 		userIds = strings.Trim(userIds, ",")
 
-		var RoleSet auditsetting.BaseOilAuditSetting
+		var RoleSet auditsetting.Base_OilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTAUDIT, &RoleSet)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.REPORTAUDIT, &RoleSet)
 
 		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(reportEntity.Id), this.User.Id)
 		emptyEntity.FlowKey = processInstanceId
@@ -934,20 +935,20 @@ func (this *CreateReportController) generateExcelReportN(entrustMain limsentrust
 	case limsdoctemplate.DAYT_EQUIPOTENT_REPORT:
 		seqStr := entrustMain.EntrustNo
 		svc := limsreportequipotent.GetLimsReportEquipotentService(utils.DBE)
-		reportUrl, err = svc.DataToExcelReport("○",entrustMain, this.User.AccCode+LimsReportEquipotentName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
-		UnHGReportUrl, err = svc.DataToExcelReport("×",entrustMain, this.User.AccCode+LimsReportEquipotentName, this.User.AccCode+LimsDateEntryName,this.User.AccCode+LimsCreateReportName,BaseUserName,seqStr, docTemplate.FileURL, entrustId, this.User.Description,dataentryIds)
+		reportUrl, err = svc.DataToExcelReport("○", entrustMain, this.User.AccCode+LimsReportEquipotentName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
+		UnHGReportUrl, err = svc.DataToExcelReport("×", entrustMain, this.User.AccCode+LimsReportEquipotentName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
 	//电气接地装置报告
 	case limsdoctemplate.DAYT_ELECGROUND_REPORT:
 		seqStr := entrustMain.EntrustNo
 		svc := limsreportelecground.GetLimsReportElecGroundService(utils.DBE)
-		reportUrl, err = svc.DataToExcelReport("○",entrustMain, this.User.AccCode+LimsReportElecGroundName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
-		UnHGReportUrl, err = svc.DataToExcelReport("×",entrustMain, this.User.AccCode+LimsReportElecGroundName,this.User.AccCode+LimsDateEntryName,this.User.AccCode+LimsCreateReportName,BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description,dataentryIds)
+		reportUrl, err = svc.DataToExcelReport("○", entrustMain, this.User.AccCode+LimsReportElecGroundName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
+		UnHGReportUrl, err = svc.DataToExcelReport("×", entrustMain, this.User.AccCode+LimsReportElecGroundName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
 		//漏电保护检测报告
 	case limsdoctemplate.DAYT_LEAKPROTECT_REPORT:
 		seqStr := entrustMain.EntrustNo
 		svc := limsreportldbh.GetLimsReportldbhService(utils.DBE)
-		reportUrl, err = svc.DataToExcelReport("○",entrustMain, this.User.AccCode+LimsReportLeakProtectName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
-		UnHGReportUrl, err = svc.DataToExcelReport("×",entrustMain, this.User.AccCode+LimsReportLeakProtectName,this.User.AccCode+LimsDateEntryName,this.User.AccCode+LimsCreateReportName,BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description,dataentryIds)
+		reportUrl, err = svc.DataToExcelReport("○", entrustMain, this.User.AccCode+LimsReportLeakProtectName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
+		UnHGReportUrl, err = svc.DataToExcelReport("×", entrustMain, this.User.AccCode+LimsReportLeakProtectName, this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsCreateReportName, BaseUserName, seqStr, docTemplate.FileURL, entrustId, this.User.Description, dataentryIds)
 	}
 	return reportUrl, UnHGReportUrl, err
 }
@@ -1553,7 +1554,7 @@ func (this *CreateReportController) SignTrans() {
 // @router /reportnumcheck/ [put]
 func (this *CreateReportController) ShenHeReportCheck() {
 	svc := limsdataentry.GetLimsDataEntryService(utils.DBE)
-	var jsonblob= this.Ctx.Input.RequestBody
+	var jsonblob = this.Ctx.Input.RequestBody
 	var dataother ShenHeModel
 	var errinfo ErrorInfo
 	json.Unmarshal(jsonblob, &dataother)
@@ -1561,14 +1562,15 @@ func (this *CreateReportController) ShenHeReportCheck() {
 	where := " Id = '" + strconv.Itoa(dataother.ReportId) + "'"
 	svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName, where, &list)
 	var reportlistall []limscreatereport.LimsCreateReport
-	svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName," EId=" + utils.ToStr(list[0].EId) + "",&reportlistall)
-	if len(reportlistall)>1{
+	svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName, " EId="+utils.ToStr(list[0].EId)+"", &reportlistall)
+	if len(reportlistall) > 1 {
 		errinfo.Message = "确认报告审核不通过？"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
 }
+
 // @Title 审核
 // @Description 审核
 // @Success	200	{object} controllers.Request
@@ -1595,9 +1597,9 @@ func (this *CreateReportController) ShenHeReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		var RoleSet auditsetting.BaseOilAuditSetting
+		var RoleSet auditsetting.Base_OilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.REPORTISSUE, &RoleSet)
 		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
 		var userIds string
 		for _, tmpUser := range users {
@@ -1630,7 +1632,7 @@ func (this *CreateReportController) ShenHeReport() {
 		where := " Id = '" + strconv.Itoa(dataother.ReportId) + "'"
 		svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName, where, &list)
 		var reportlistall []limscreatereport.LimsCreateReport
-		svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName," EId=" + utils.ToStr(list[0].EId) + "",&reportlistall)
+		svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName, " EId="+utils.ToStr(list[0].EId)+"", &reportlistall)
 		var entityempty limscreatereport.LimsCreateReport
 		entityempty.ReportStatus = dataother.SuccessStatus
 		entityempty.ConUserOn = time.Now()
@@ -1641,13 +1643,13 @@ func (this *CreateReportController) ShenHeReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		var RoleSet auditsetting.BaseOilAuditSetting
+		var RoleSet auditsetting.Base_OilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
-		for j:=0;j<len(reportlistall);j++{
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.REPORTISSUE, &RoleSet)
+		for j := 0; j < len(reportlistall); j++ {
 			receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(reportlistall[j].Id), strconv.Itoa(reportlistall[j].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
 			if receiveVal == "true" {
-				for i:=0;i<len(reportlistall);i++{
+				for i := 0; i < len(reportlistall); i++ {
 					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, reportlistall[i].Id, entityempty, cols)
 					if err == nil {
 						errinfo.Message = "未通过审核！"
@@ -1674,22 +1676,22 @@ func (this *CreateReportController) ShenHeReport() {
 		var dataentryentity []limsdataentry.LimsDateEntry
 		var balanceentityempty limsbalance.LimsTaskBalance
 		var dataentryentityempty limsdataentry.LimsDateEntry
-		svc.GetEntityByWhere(this.User.AccCode+LimsTaskBalanceName," EId=" + utils.ToStr(list[0].EId) + "",&balanceentity)
+		svc.GetEntityByWhere(this.User.AccCode+LimsTaskBalanceName, " EId="+utils.ToStr(list[0].EId)+"", &balanceentity)
 		var balancecols []string = []string{"DataEntryStatus"}
 		balanceentityempty.DataEntryStatus = 0
 		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, balanceentity.Id, balanceentityempty, balancecols)
 		fmt.Println(err)
-		svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName," EId=" + utils.ToStr(list[0].EId) + "",&dataentryentity)
-		for i:=0; i<len(dataentryentity) ;i++  {
-			var dataentrycols []string = []string{"CheckStatus","DocKey"}
+		svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, " EId="+utils.ToStr(list[0].EId)+"", &dataentryentity)
+		for i := 0; i < len(dataentryentity); i++ {
+			var dataentrycols []string = []string{"CheckStatus", "DocKey"}
 			dataentryentityempty.CheckStatus = 0
-			dataentryentityempty.CreateOn=time.Now()
+			dataentryentityempty.CreateOn = time.Now()
 			//启动数据录入工作流
 			svcActiviti := workflow.GetActivitiService(utils.DBE)
 			var processInstanceId string
-			processInstanceId=svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity[i].Id), strconv.Itoa(dataentryentity[i].CheckUserId))
+			processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity[i].Id), strconv.Itoa(dataentryentity[i].CheckUserId))
 
-			dataentryentityempty.DocKey=processInstanceId
+			dataentryentityempty.DocKey = processInstanceId
 			svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, dataentryentity[i].Id, dataentryentityempty, dataentrycols)
 		}
 	}
@@ -1705,9 +1707,9 @@ func (this *CreateReportController) QianfaReport() {
 	var dataother ShenHeModel
 	json.Unmarshal(jsonblob, &dataother)
 	var list []limscreatereport.LimsCreateReport
-	var RoleSet auditsetting.BaseOilAuditSetting
+	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.REPORTISSUE, &RoleSet)
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 3 {
 		where := " Id = '" + strconv.Itoa(dataother.ReportId) + "'"
@@ -1867,9 +1869,9 @@ func (this *CreateReportController) DelReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		var RoleSet auditsetting.BaseOilAuditSetting
+		var RoleSet auditsetting.Base_OilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.REPORTISSUE, &RoleSet)
 		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, Id, "", this.User.Id, "0", "特检删除报告")
 		if receiveVal == "true" {
 			errinfo.Message = "删除成功"
@@ -1883,7 +1885,7 @@ func (this *CreateReportController) DelReport() {
 			this.ServeJSON()
 			return
 		}
-		
+
 	} else {
 		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
 		errinfo.Code = -1

src/dashoo.cn/backend/api/controllers/lims/limsindex.go

@@ -1,19 +1,22 @@
 package lims
 
 import (
-	"dashoo.cn/backend/api/business/auditsetting"
 	"encoding/json"
 	"strconv"
 	"strings"
+
+	"dashoo.cn/backend/api/business/auditsetting"
+
 	//"time"
 	//"fmt"
 
-	"dashoo.cn/business2/organize"
-	"dashoo.cn/business2/permission"
-	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/business/limsdataentry"
 	"dashoo.cn/backend/api/business/limsindex"
 	"dashoo.cn/backend/api/business/workflow"
+	"dashoo.cn/business2/organize"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
+
 	//"dashoo.cn/backend/api/business/authcode"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
@@ -42,9 +45,9 @@ func (this *LimsIndexController) GetWaiting() {
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.BaseOilAuditSetting
+	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
 	//switch this.User.DepartmentId {
 	//case "100000150":
@@ -87,9 +90,9 @@ func (this *LimsIndexController) GetDone() {
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.BaseOilAuditSetting
+	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetHistoryMyTasks(RoleSet.WorkFlowCord, this.User.Id)
 	//switch this.User.DepartmentId {
 	//case "100000150":