特检流程

src/dashoo.cn/backend/api/business/organize/organizeService.go

@@ -178,3 +178,18 @@ func (s *OrganizeService) GetAllThirdChildByTopId(topid, uid string) (entitys []
 	s.DBE.SQL(sql).Find(&entitys)
 	return entitys
 }
+
+//获得category为unit的父节点
+func (s *OrganizeService) GetMyUnitThirdDepartmentId(topid string) string {
+	var entity Base_Organize
+	ids := s.GetAllParentByTopAccCode(topid, "")
+	if len(ids) <= 0 { //没有父节点
+		return topid
+	}
+	sql := "select * from Base_Organize  where id in (" + ids + ") and Category='unitthird'"
+	s.DBE.Sql(sql).Get(&entity)
+	if &entity == nil || entity.Id <= 0 { //没有category为unit的父节点
+		return topid
+	}
+	return strconv.Itoa(entity.Id)
+}

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

@@ -53,6 +53,7 @@ import (
 	"dashoo.cn/backend/api/business/limsreportnobeampumpingunits"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
+	myorganize "dashoo.cn/backend/api/business/organize"
 )
 
 type CreateReportController struct {
@@ -349,24 +350,36 @@ func (this *CreateReportController) GetReportEntrustList() {
 	ProjectTypeId := this.GetString("ProjectTypeId")
 	orderby := "a.Id desc"
 
-	userSvc := userRole.GetUserService(utils.DBE)
-	organizeSvc := organize.GetOrganizeService(utils.DBE)
-	departList := organizeSvc.GetChildByTopId(this.User.DepartmentId)
+	//userSvc := userRole.GetUserService(utils.DBE)
+	//organizeSvc := organize.GetOrganizeService(utils.DBE)
+	//departList := organizeSvc.GetChildByTopId(this.User.DepartmentId)
 	//取出当前部门及下级部门的所有用户列表
-	var subUserList []userRole.Base_User
-	whereUser := " 1=1 "
-	whereUser += " and DepartmentId in (" + departList + ")"
-	userSvc.GetEntities(&subUserList, whereUser)
-	var userIds string
+	//var subUserList []userRole.Base_User
+	//whereUser := " 1=1 "
+	//whereUser += " and DepartmentId in (" + departList + ")"
+	//userSvc.GetEntities(&subUserList, whereUser)
+	//var userIds string
+	//
+	//for _, tmpUser := range subUserList {
+	//	userIds += strconv.Itoa(tmpUser.Id) + ","
+	//}
+	//userIds = strings.Trim(userIds, ",")
 
-	for _, tmpUser := range subUserList {
+	svc := myorganize.GetOrganizeService(utils.DBE)
+	unitThirdId := svc.GetMyUnitThirdDepartmentId(this.User.DepartmentId)
+
+	var userlist []userRole.Base_User
+	whereuser := "UnitThirdId=" + unitThirdId
+	svc.GetEntities(&userlist, whereuser)
+	userIds := ""
+	for _, tmpUser := range userlist {
 		userIds += strconv.Itoa(tmpUser.Id) + ","
 	}
 	userIds = strings.Trim(userIds, ",")
 
 	where := " 1=1 "
 	where += " and a.CreateUserId in (" + userIds + ")"
-	where += " AND c.CheckStatus = 4 and (a.ReportStatus = 0 or a.ReportStatus is NULL) and c.CreateReportStatus = 0 "
+	where += " AND c.CheckStatus = 6 and (a.ReportStatus = 0 or a.ReportStatus is NULL) and c.CreateReportStatus = 0 "
 
 	if entrustno != "" {
 		where = where + " and a.EntrustNo like '%" + entrustno + "%'"
@@ -395,8 +408,8 @@ func (this *CreateReportController) GetReportEntrustList() {
 		}
 	}
 	var list []limscreatereport.DataEntryEntrustModel
-	svc := limscreatereport.GetCreateReportService(utils.DBE)
-	total, list := svc.GetDataEntryEntrust(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsTaskBalanceName, this.User.AccCode+LimsEntrustMainName, page.CurrentPage, page.Size, orderby, where)
+	svclims := limscreatereport.GetCreateReportService(utils.DBE)
+	total, list := svclims.GetDataEntryEntrust(this.User.AccCode+LimsDateEntryName, this.User.AccCode+LimsTaskBalanceName, this.User.AccCode+LimsEntrustMainName, page.CurrentPage, page.Size, orderby, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

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

@@ -65,6 +65,7 @@ import (
 
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
+	myorganize "dashoo.cn/backend/api/business/organize"
 )
 
 type LimsDataEntryController struct {
@@ -3262,7 +3263,18 @@ func (this *LimsDataEntryController) JiaoHe() {
 	var userIds string
 	var RoleSet auditsetting.Base_OilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAPREAUDIT, &RoleSet)
+
+	svct := myorganize.GetOrganizeService(utils.DBE)
+	unitThirdId := svct.GetMyUnitThirdDepartmentId(this.User.DepartmentId)
+	checkStatus := 0
+	if unitThirdId == "100001215" {
+		checkStatus = 4
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
+	} else {
+		checkStatus = dataother.SuccessStatus
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAPREAUDIT, &RoleSet)
+	}
+
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 2 {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
@@ -3273,7 +3285,7 @@ func (this *LimsDataEntryController) JiaoHe() {
 		var balancecols []string = []string{"DataEntryStatus"}
 		var cols []string = []string{"DocVersion", "CheckStatus", "JHOn", "JHUserId", "JHBy", "JHRemark"}
 		entityempty.DocVersion = "v" + currentTime
-		entityempty.CheckStatus = dataother.SuccessStatus
+		entityempty.CheckStatus = checkStatus
 		balanceempty.DataEntryStatus = dataother.SuccessStatus
 		entityempty.JHOn = time.Now()
 		entityempty.JHUserId, _ = utils.StrTo(this.User.Id).Int()

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

@@ -1,8 +1,10 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/organize"
 	"encoding/json"
 	"strconv"
+	"strings"
 
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/backend/api/business/testtype"
@@ -106,28 +108,43 @@ func (this *TestTypeController) TestTypelistByOrg() {
 // @router /testypetreebyorg [get]
 func (this *TestTypeController) TestTypeTreeByOrg() {
 	var list []testtype.TestTemplateModel
-	svc := testtype.GetTestTypeService(utils.DBE)
-	userSvc := userRole.GetUserService(utils.DBE)
-	curUserInfo := userSvc.GetUserInfoByRealName(this.User.Realname)
-	//取出下级用户
-	var subUserList []userRole.Base_User
-	whereUser := " 1=1 "
-	whereUser += " and CreateUserId = " + strconv.Itoa(curUserInfo.Id)
-	userSvc.GetEntities(&subUserList, whereUser)
-	var userIds string
+	//svc := testtype.GetTestTypeService(utils.DBE)
+	//userSvc := userRole.GetUserService(utils.DBE)
+	//curUserInfo := userSvc.GetUserInfoByRealName(this.User.Realname)
+	////取出下级用户
+	//var subUserList []userRole.Base_User
+	//whereUser := " 1=1 "
+	//whereUser += " and CreateUserId = " + strconv.Itoa(curUserInfo.Id)
+	//userSvc.GetEntities(&subUserList, whereUser)
+	//var userIds string
+	//
+	//for _, tmpUser := range subUserList {
+	//	userIds += strconv.Itoa(tmpUser.Id) + ","
+	//}
+	////上级用户
+	//userIds += strconv.Itoa(curUserInfo.Createuserid) + ","
+	////当前登录用户
+	//userIds += strconv.Itoa(curUserInfo.Id)
+	//
+	//where := " 1=1 "
+	//where += " AND a.CreateUserId in (" + userIds + ")"
 
-	for _, tmpUser := range subUserList {
+	svc := organize.GetOrganizeService(utils.DBE)
+	unitThirdId := svc.GetMyUnitThirdDepartmentId(this.User.DepartmentId)
+
+	var userlist []userRole.Base_User
+	whereuser := "UnitThirdId=" + unitThirdId
+	svc.GetEntities(&userlist, whereuser)
+	userIds := ""
+	for _, tmpUser := range userlist {
 		userIds += strconv.Itoa(tmpUser.Id) + ","
 	}
-	//上级用户
-	userIds += strconv.Itoa(curUserInfo.Createuserid) + ","
-	//当前登录用户
-	userIds += strconv.Itoa(curUserInfo.Id)
+	userIds = strings.Trim(userIds, ",")
 
-	where := " 1=1 "
-	where += " AND a.CreateUserId in (" + userIds + ")"
+	where := "a.CreateUserId in (" + userIds + ")"
 
-	list = svc.GetListWithTemplate(this.User.AccCode+TestPackageTypesName, this.User.AccCode+LimsDocTemplateName, where, "a.Id desc")
+	svctype := testtype.GetTestTypeService(utils.DBE)
+	list = svctype.GetListWithTemplate(this.User.AccCode+TestPackageTypesName, this.User.AccCode+LimsDocTemplateName, where, "a.Id desc")
 	var datainfo DataInfo
 	datainfo.Items = list
 	this.Data["json"] = &datainfo

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -162,18 +162,18 @@ module.exports = {
 	  baseURL: '//localhost:10091/api/'
   },
   ignore: [
-    // 'pages/lims/report*/**/*.*',
-    'pages/lims/createreport/**/*.*',
-    // 'pages/lims/dataentry/**/*.*',
-    'pages/lims/deliver/**/*.*',
-    'pages/lims/drillingdaily/**/*.*',
-    'pages/lims/oiltestingdaily/**/*.*',
-    'pages/lims/preparation/**/*.*',
-    'pages/lims/tasksbalance/**/*.*',
-    // 'pages/system/**/*.*',
-    // 'pages/setting/**/*.*',
-    'pages/prototype/**/*.*',
-    'pages/material/**/*.*',
-    'pages/report/**/*.*',
+    // // 'pages/lims/report*/**/*.*',
+    // 'pages/lims/createreport/**/*.*',
+    // // 'pages/lims/dataentry/**/*.*',
+    // 'pages/lims/deliver/**/*.*',
+    // 'pages/lims/drillingdaily/**/*.*',
+    // 'pages/lims/oiltestingdaily/**/*.*',
+    // 'pages/lims/preparation/**/*.*',
+    // 'pages/lims/tasksbalance/**/*.*',
+    // // 'pages/system/**/*.*',
+    // // 'pages/setting/**/*.*',
+    // 'pages/prototype/**/*.*',
+    // 'pages/material/**/*.*',
+    // 'pages/report/**/*.*',
   ]
 }