Browse Source

修改设定

master
超级管理员 3 years ago
parent
commit
5e0c31e5fb
  1. 6
      Dockerfile
  2. 2
      README.md
  3. 14
      api/admin/dutyassess/assess.go
  4. 102
      api/admin/dutyassess/assesstype.go
  5. 8
      api/admin/dutyassess/dutyes.go
  6. 8
      api/admin/dutyassess/dutyhandle.go
  7. 8
      api/admin/dutyassess/planversio.go
  8. 10
      api/admin/dutyassess/position.go
  9. 6
      api/admin/enter.go
  10. 20
      api/admin/groupmanagement/branchfactorygroup/branchfactory.go
  11. 20
      api/admin/groupmanagement/branchfactorygroup/duties.go
  12. 22
      api/admin/groupmanagement/branchfactorygroup/team.go
  13. 34
      api/admin/groupmanagement/branchfactorygroup/type.go
  14. 22
      api/admin/groupmanagement/branchfactorygroup/workshopsection.go
  15. 2
      api/admin/groupmanagement/enter.go
  16. 34
      api/admin/systemuser/adminrole.go
  17. 20
      api/admin/systemuser/menutype.go
  18. 30
      api/admin/systemuser/systemmenu.go
  19. 34
      api/admin/systemuser/userhandle.go
  20. 28
      api/admin/systemuser/usertype.go
  21. 58
      api/index/assessment/assesshandle.go
  22. 56
      api/index/assessment/assesstype.go
  23. 8
      api/index/enter.go
  24. 16
      api/index/evaluation/assessment.go
  25. 8
      api/index/evaluation/enter.go
  26. 34
      api/index/evaluation/evaluation.go
  27. 12
      api/index/evaluation/examineflow.go
  28. 22
      api/index/evaluation/flowsend.go
  29. 14
      api/index/evaluation/flowsendnew.go
  30. 12
      api/index/evaluation/lookquantita.go
  31. 10
      api/index/evaluation/sendwechatmsg.go
  32. 60
      api/index/evaluation/type.go
  33. 12
      api/index/examineandapprove/examapp.go
  34. 16
      api/index/statistics/dataform.go
  35. 2
      api/index/statistics/enter.go
  36. 10
      api/index/statistics/newstatistics.go
  37. 22
      api/index/statistics/programme.go
  38. 12
      api/index/statistics/queryresults.go
  39. 10
      api/index/statistics/tablestatistics.go
  40. 2
      api/json_callback/httpserver.go
  41. 2
      api/json_callback/sample.go
  42. 2
      api/publichandle/enter.go
  43. 18
      api/publichandle/userhandle/handel.go
  44. 2
      api/publichandle/userhandle/type.go
  45. 6
      api/reply/enter.go
  46. 12
      api/reply/qual/controller.go
  47. 18
      api/reply/qual/divisionrectification.go
  48. 10
      api/reply/qual/enter.go
  49. 12
      api/reply/quan/controller.go
  50. 14
      api/reply/quan/enter.go
  51. 10
      api/reply/quan/ration.go
  52. 4
      api/statistics/enter.go
  53. 18
      api/statistics/nature/statistics.go
  54. 12
      api/statistics/quantification/auxiliarycalculation.go
  55. 6
      api/statistics/quantification/departmentstatisc.go
  56. 6
      api/statistics/quantification/enter.go
  57. 12
      api/statistics/quantification/jisuanshuzhi.go
  58. 16
      api/statistics/quantification/quant.go
  59. 2
      api/statistics/quantification/shiyan.go
  60. 12
      api/statistics/quantification/summary_details.go
  61. 8
      api/statistics/quantification/timestatistics.go
  62. 57
      api/textcomparison/chinatopinyin.go
  63. 83
      api/textcomparison/goJieba.go
  64. 24
      api/v1/archiveapi/archiveapihandle.go
  65. 36
      api/v1/archiveapi/graphicinformation.go
  66. 30
      api/v1/archiveapi/requestdata.go
  67. 22
      api/v1/assessment/assesshandle.go
  68. 39
      api/v1/assessment/department_target.go
  69. 20
      api/v1/assessment/detailed_target.go
  70. 26
      api/v1/assessment/dutyhandle.go
  71. 26
      api/v1/assessment/dutylist.go
  72. 152
      api/v1/assessment/dutytype.go
  73. 8
      api/v1/assessment/newassessment.go
  74. 14
      api/v1/assessment/programme.go
  75. 40
      api/v1/assessment/qualitative_evaluation.go
  76. 18
      api/v1/assessment/qualitative_target.go
  77. 28
      api/v1/assessment/ration_evaluation.go
  78. 8
      api/v1/assessment/set_evaluation_objectives.go
  79. 32
      api/v1/assessment/specificduty.go
  80. 12
      api/v1/assessment/target.go
  81. 12
      api/v1/autocode/autocodeExample.go
  82. 4
      api/v1/autocode/enter.go
  83. 32
      api/v1/custom/customhandle.go
  84. 26
      api/v1/enter.go
  85. 8
      api/v1/examination/exampage.go
  86. 8
      api/v1/examination/testquestions.go
  87. 2
      api/v1/example/enter.go
  88. 8
      api/v1/example/exa_breakpoint_continue.go
  89. 12
      api/v1/example/exa_customer.go
  90. 8
      api/v1/example/exa_excel.go
  91. 10
      api/v1/example/exa_file_upload_download.go
  92. 16
      api/v1/examtestpage/examtype.go
  93. 60
      api/v1/examtestpage/grouphandle.go
  94. 38
      api/v1/examtestpage/healthreportstat.go
  95. 30
      api/v1/examtestpage/healthreportstathand.go
  96. 14
      api/v1/fileuploaddownload/fileupdowntype.go
  97. 6
      api/v1/fileuploaddownload/fileuploaddown.go
  98. 4
      api/v1/positionkpi/entry.go
  99. 10
      api/v1/positionkpi/posttarget.go
  100. 10
      api/v1/positionkpi/posttargetcont.go

6
Dockerfile

@ -1,6 +1,6 @@
FROM golang:alpine as builder FROM golang:alpine as builder
WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server WORKDIR /go/src/gin_server_admin
COPY . . COPY . .
RUN go env -w GO111MODULE=on RUN go env -w GO111MODULE=on
@ -13,9 +13,9 @@ RUN go build -o server .
FROM alpine:latest FROM alpine:latest
LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com" LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server WORKDIR /go/src/gin_server_admin
COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server ./ COPY --from=0 /go/src/gin_server_admin ./
EXPOSE 8888 EXPOSE 8888

2
README.md

@ -25,7 +25,7 @@
├── timer ├── timer
└── upload └── upload
``` ```
## 文件说明 ## 文件说明 module gin_server_admin
| 文件夹 | 说明 | 描述 | | 文件夹 | 说明 | 描述 |
| ------------ | ----------------------- | --------------------------- | | ------------ | ----------------------- | --------------------------- |

14
api/admin/dutyassess/assess.go

@ -7,13 +7,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/assessment" "gin_server_admin/api/v1/assessment"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/examtestpage" "gin_server_admin/api/v1/examtestpage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

102
api/admin/dutyassess/assesstype.go

@ -3,30 +3,30 @@ package dutyassess
import ( import (
"sync" "sync"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
type DutyAssessApi struct{} type DutyAssessApi struct{}
//协程设置 // 协程设置
var syncProcess = sync.WaitGroup{} var syncProcess = sync.WaitGroup{}
//数据锁统计 // 数据锁统计
type dataLockStatistics struct { type dataLockStatistics struct {
dataMap []map[string]interface{} dataMap []map[string]interface{}
dataErrMap []map[string]interface{} dataErrMap []map[string]interface{}
mutext sync.RWMutex mutext sync.RWMutex
} }
//读取锁数据 // 读取锁数据
func (d *dataLockStatistics) readMyDayData() ([]map[string]interface{}, []map[string]interface{}) { func (d *dataLockStatistics) readMyDayData() ([]map[string]interface{}, []map[string]interface{}) {
d.mutext.RLock() d.mutext.RLock()
defer d.mutext.RUnlock() defer d.mutext.RUnlock()
return d.dataMap, d.dataErrMap return d.dataMap, d.dataErrMap
} }
//获取部门考核列表 // 获取部门考核列表
type getDepartAssObtain struct { type getDepartAssObtain struct {
commonus.PageSetLimt commonus.PageSetLimt
DepartID string `json:"depart"` //部门Id DepartID string `json:"depart"` //部门Id
@ -38,12 +38,12 @@ type getDepartAssObtains struct {
Time string `json:"time"` //查询日期 Time string `json:"time"` //查询日期
} }
//获取集团分厂 // 获取集团分厂
type getGroupDepart struct { type getGroupDepart struct {
Id []int64 Id []int64
} }
//部门月份具体考核详情 // 部门月份具体考核详情
type departMonth struct { type departMonth struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Title string `json:"title"` Title string `json:"title"`
@ -62,12 +62,12 @@ type departDutyList struct {
DutyTitle string `json:"dutyTitle"` DutyTitle string `json:"dutyTitle"`
} }
//归档审批人 // 归档审批人
type commentUser struct { type commentUser struct {
UserKey int64 `json:"userkey" gorm:"column:s_comment_user;type:bigint(20) unsigned;default:0;not null;comment:评论人"` UserKey int64 `json:"userkey" gorm:"column:s_comment_user;type:bigint(20) unsigned;default:0;not null;comment:评论人"`
} }
//输出考核关系架构 // 输出考核关系架构
type outAessDuty struct { type outAessDuty struct {
ClassId int64 `json:"classId"` ClassId int64 `json:"classId"`
ClassTitle string `json:"classTitle"` ClassTitle string `json:"classTitle"`
@ -76,7 +76,7 @@ type outAessDuty struct {
DutyTitle string `json:"dutyTitle"` DutyTitle string `json:"dutyTitle"`
} }
//具体职责项与考核项目,类别 // 具体职责项与考核项目,类别
type dutyAssClass struct { type dutyAssClass struct {
Title string `json:"title" gorm:"column:dc_title;type:text;comment:具体职责"` Title string `json:"title" gorm:"column:dc_title;type:text;comment:具体职责"`
PartId int64 `json:"partId" gorm:"column:dc_parent;type:bigint(20) unsigned;default:0;not null;comment:父级"` PartId int64 `json:"partId" gorm:"column:dc_parent;type:bigint(20) unsigned;default:0;not null;comment:父级"`
@ -85,7 +85,7 @@ type dutyAssClass struct {
ClassTitle string `json:"Classtitle" gorm:"column:title;type:varchar(255);comment:职责类别名称"` ClassTitle string `json:"Classtitle" gorm:"column:title;type:varchar(255);comment:职责类别名称"`
} }
//部门月份考核列表 // 部门月份考核列表
type departMonthMap struct { type departMonthMap struct {
DepartId int64 `json:"departId"` //部门ID DepartId int64 `json:"departId"` //部门ID
DepartTitle string `json:"departTitle"` //部门名称 DepartTitle string `json:"departTitle"` //部门名称
@ -93,7 +93,7 @@ type departMonthMap struct {
DateStr string `json:"datestr"` //日期字符串 DateStr string `json:"datestr"` //日期字符串
} }
//定量考核目标设定查询 // 定量考核目标设定查询
type SelectQuantitativeConfig struct { type SelectQuantitativeConfig struct {
GroupId string `json:"groupid"` GroupId string `json:"groupid"`
DepartmentID string `json:"departmentid"` DepartmentID string `json:"departmentid"`
@ -107,7 +107,7 @@ type SelectQuantitativeConfig struct {
Title string `json:"title"` //指标标题 Title string `json:"title"` //指标标题
} }
//输出 // 输出
type OutQuantitativeConfig struct { type OutQuantitativeConfig struct {
assessmentmodel.QuantitativeConfig assessmentmodel.QuantitativeConfig
GroupTitle string `json:"grouptitle"` //操作组 GroupTitle string `json:"grouptitle"` //操作组
@ -117,13 +117,13 @@ type OutQuantitativeConfig struct {
DetailedTargetTitle string `json:"detailedtargenttitle"` //指标明细 DetailedTargetTitle string `json:"detailedtargenttitle"` //指标明细
} }
//输出定性指标列表 // 输出定性指标列表
type DutySelectList struct { type DutySelectList struct {
assessmentmodel.EvaluationTarget assessmentmodel.EvaluationTarget
DepartmentList []string DepartmentList []string
} }
//考核方案细则列表输出 // 考核方案细则列表输出
type TargetContOutCont struct { type TargetContOutCont struct {
Id string `json:"id"` Id string `json:"id"`
Type int `json:"type"` Type int `json:"type"`
@ -167,7 +167,7 @@ type TargetContOutCont struct {
} }
//定性考核列表输出 // 定性考核列表输出
type QualEvalArrt struct { type QualEvalArrt struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
@ -179,7 +179,7 @@ type QualEvalArrt struct {
Operator []string `json:"operator"` //操作人 Operator []string `json:"operator"` //操作人
} }
//输出定性考核列表 // 输出定性考核列表
type OutDutyList struct { type OutDutyList struct {
Id string `json:"id"` Id string `json:"id"`
Target string `json:"target"` //指标ID Target string `json:"target"` //指标ID
@ -202,7 +202,7 @@ type DepartmentAryType struct {
Parentname string `json:"parentname"` Parentname string `json:"parentname"`
} }
//输出定性考核列表 // 输出定性考核列表
type OutDutyListes struct { type OutDutyListes struct {
Id string `json:"id"` Id string `json:"id"`
Target string `json:"target"` //指标ID Target string `json:"target"` //指标ID
@ -222,7 +222,7 @@ type OutDutyListes struct {
Group string `json:"group"` Group string `json:"group"`
} }
//根据指标ID获取相关信息 // 根据指标ID获取相关信息
type TargetFormId struct { type TargetFormId struct {
OutDutyList OutDutyList
SunTargetList []SunTargetListType `json:"sunlist"` SunTargetList []SunTargetListType `json:"sunlist"`
@ -239,7 +239,7 @@ type DetailedTargetType struct {
UserListAry []QualEvalArrt `json:"userlistary"` //执行人列表 UserListAry []QualEvalArrt `json:"userlistary"` //执行人列表
} }
//获取定性指标->指标细则修改回显 // 获取定性指标->指标细则修改回显
type OutTargetCont struct { type OutTargetCont struct {
Id string `json:"id"` Id string `json:"id"`
SunTargerId string `json:"suntargetid"` SunTargerId string `json:"suntargetid"`
@ -260,7 +260,7 @@ type OutTargetCont struct {
DepartmentId []string `json:"departmentid"` //接受考核的部门 DepartmentId []string `json:"departmentid"` //接受考核的部门
} }
//获取定性指标->指标细则修改回显修改或新增 // 获取定性指标->指标细则修改回显修改或新增
type GetEiteTargetCont struct { type GetEiteTargetCont struct {
Id string `json:"id"` Id string `json:"id"`
Class int `json:"class"` //1、新增;2、修改 Class int `json:"class"` //1、新增;2、修改
@ -278,7 +278,7 @@ type GetEiteTargetCont struct {
DepartmentId []string `json:"departmentid"` //接受考核的部门 DepartmentId []string `json:"departmentid"` //接受考核的部门
} }
//添加 定性考核指标关系指定 // 添加 定性考核指标关系指定
type AddQualEval struct { type AddQualEval struct {
AcceptDepartmentId []string `json:"parentid"` //接受考核部门 AcceptDepartmentId []string `json:"parentid"` //接受考核部门
Dimension string `json:"dimension"` //考核维度 Dimension string `json:"dimension"` //考核维度
@ -291,7 +291,7 @@ type AddQualEval struct {
EvaluationList []QualEvalSunList `json:"evaluationlist"` //测评详情 EvaluationList []QualEvalSunList `json:"evaluationlist"` //测评详情
} }
//定性考核内容 // 定性考核内容
type QualEvalSunList struct { type QualEvalSunList struct {
DetailedTarget string `json:"id"` //考核细则 DetailedTarget string `json:"id"` //考核细则
Title string `json:"title"` //指标说明 Title string `json:"title"` //指标说明
@ -311,14 +311,14 @@ type QualEvalSunList struct {
CensorRate int `json:"censorrate"` //检查频次 CensorRate int `json:"censorrate"` //检查频次
} }
//添加 定性考核指标关系指定细则 // 添加 定性考核指标关系指定细则
type DutyAssEssTarget struct { type DutyAssEssTarget struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Operator []string `json:"operator"` //考核执行人 Operator []string `json:"operator"` //考核执行人
Department []string `json:"department"` //部门 Department []string `json:"department"` //部门
} }
//查看定性指标详情列表 // 查看定性指标详情列表
type LookTargetContList struct { type LookTargetContList struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
TargetId string `json:"targetid"` TargetId string `json:"targetid"`
@ -330,13 +330,13 @@ type LookTargetContList struct {
CensorRate int `json:"censorrate"` //检查频次 CensorRate int `json:"censorrate"` //检查频次
} }
//查看定性指标细则提交参数 // 查看定性指标细则提交参数
type GetDeitalTarCont struct { type GetDeitalTarCont struct {
Id string `json:"id"` Id string `json:"id"`
AssId string `json:"assid"` AssId string `json:"assid"`
} }
//输出新版指标明细列表 // 输出新版指标明细列表
type NewOutPutDetailedTarget struct { type NewOutPutDetailedTarget struct {
OutTargetCont OutTargetCont
Unit string `json:"unit"` //单位 Unit string `json:"unit"` //单位
@ -345,7 +345,6 @@ type NewOutPutDetailedTarget struct {
AddReduce int `json:"addreduce"` //1:减少;2:增加;3:无属性,现场确认加或减 AddReduce int `json:"addreduce"` //1:减少;2:增加;3:无属性,现场确认加或减
} }
//
type NewEiteDtyDiteCont struct { type NewEiteDtyDiteCont struct {
GetEiteTargetCont GetEiteTargetCont
AssId string `json:"assid"` AssId string `json:"assid"`
@ -354,13 +353,13 @@ type NewEiteDtyDiteCont struct {
AddOrReduce int `json:"addreduce"` //1:减少;2:增加 AddOrReduce int `json:"addreduce"` //1:减少;2:增加
} }
//定量考核列表查询 // 定量考核列表查询
type rationSelect struct { type rationSelect struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DepartmentId string `json:"parentid"` //接受考核部门 DepartmentId string `json:"parentid"` //接受考核部门
} }
//部门考核指标组合列表输出 // 部门考核指标组合列表输出
type DepartTargetListTop struct { type DepartTargetListTop struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
@ -376,7 +375,7 @@ type DepartTargetList struct {
IsTrue int `json:"istrue"` //是否允许修改 IsTrue int `json:"istrue"` //是否允许修改
} }
//添加部门考核项目新 // 添加部门考核项目新
type AddDutyNewContGroup struct { type AddDutyNewContGroup struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
DepartmentId string `json:"parentid"` //部门 DepartmentId string `json:"parentid"` //部门
@ -391,7 +390,7 @@ type AddDutyNewCont struct {
Child []EvaluPross `json:"child"` //考核细则 Child []EvaluPross `json:"child"` //考核细则
} }
//指标 // 指标
type EvaluPross struct { type EvaluPross struct {
Id string `json:"id"` //维度ID Id string `json:"id"` //维度ID
Name string `json:"name"` Name string `json:"name"`
@ -406,7 +405,7 @@ type EvaluPross struct {
Status int `json:"status"` //1:使用;2:禁用;3:观察 Status int `json:"status"` //1:使用;2:禁用;3:观察
} }
//添加部门考核过度 // 添加部门考核过度
type AddPartMentGuodu struct { type AddPartMentGuodu struct {
Group int64 `json:"group"` //集团 Group int64 `json:"group"` //集团
DeaprtId int64 `json:"deaprtid"` //部门ID DeaprtId int64 `json:"deaprtid"` //部门ID
@ -417,7 +416,7 @@ type AddPartMentGuodu struct {
Operator []string `json:"operator"` //操作人 Operator []string `json:"operator"` //操作人
} }
//删除部门指标考核获取参数 // 删除部门指标考核获取参数
type DelDutyDepartTarget struct { type DelDutyDepartTarget struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DeaprtId string `json:"deaprtid"` //部门ID DeaprtId string `json:"deaprtid"` //部门ID
@ -425,13 +424,13 @@ type DelDutyDepartTarget struct {
Dimension string `json:"dimension"` //考核维度 Dimension string `json:"dimension"` //考核维度
} }
//修改已知定性考核指标关联部门 // 修改已知定性考核指标关联部门
type EiteDutyForDepart struct { type EiteDutyForDepart struct {
LookTargetContList LookTargetContList
DepartAry []string `json:"departary"` DepartAry []string `json:"departary"`
} }
//考核方案版本列表查询 // 考核方案版本列表查询
type DutyPlanVersio struct { type DutyPlanVersio struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DeaprtId string `json:"deaprtid"` //部门ID DeaprtId string `json:"deaprtid"` //部门ID
@ -441,13 +440,13 @@ type DutyPlanVersio struct {
State int `json:"state"` //状态 State int `json:"state"` //状态
} }
//岗位考核方案版本列表查询 // 岗位考核方案版本列表查询
type positionPlanVersio struct { type positionPlanVersio struct {
DutyPlanVersio DutyPlanVersio
Position string `json:"position"` //岗位 Position string `json:"position"` //岗位
} }
//考核方案版本列表查询输出 // 考核方案版本列表查询输出
type DutyPlanVersioOut struct { type DutyPlanVersioOut struct {
assessmentmodel.PlanVersio assessmentmodel.PlanVersio
GroupName string `json:"groupname"` //归属集团 GroupName string `json:"groupname"` //归属集团
@ -463,19 +462,19 @@ type positionPlanVersionOut struct {
Time string `json:"time"` Time string `json:"time"`
} }
//查看考核方案详情 // 查看考核方案详情
type LookDutyVersio struct { type LookDutyVersio struct {
Key string `json:"key"` Key string `json:"key"`
} }
//更改状态 // 更改状态
type SetOnOffDutyVersio struct { type SetOnOffDutyVersio struct {
LookDutyVersio LookDutyVersio
IsTrue int `json:"istrue"` //强制删除 IsTrue int `json:"istrue"` //强制删除
State int `json:"state"` //状态 State int `json:"state"` //状态
} }
//并发输出 // 并发输出
type bingFaOut struct { type bingFaOut struct {
Id int64 `json:"id" gorm:"primaryKey;column:sf_id;type:bigint(20) unsigned;not null;comment:Id"` Id int64 `json:"id" gorm:"primaryKey;column:sf_id;type:bigint(20) unsigned;not null;comment:Id"`
Key int64 `json:"key" gorm:"column:sf_key;type:bigint(20) unsigned;default:0;not null;comment:识别标志"` Key int64 `json:"key" gorm:"column:sf_key;type:bigint(20) unsigned;default:0;not null;comment:识别标志"`
@ -493,7 +492,7 @@ type bingFaOutDingLiang struct {
State int `json:"state" gorm:"column:ep_state;type:int(2) unsigned;default:1;not null;comment:1:审批,2:通过;3:驳回;"` State int `json:"state" gorm:"column:ep_state;type:int(2) unsigned;default:1;not null;comment:1:审批,2:通过;3:驳回;"`
} }
//修改部门考核方案说明 // 修改部门考核方案说明
type EitrDepartExplan struct { type EitrDepartExplan struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
DeaprtId string `json:"deaprtid"` //部门ID DeaprtId string `json:"deaprtid"` //部门ID
@ -507,13 +506,12 @@ type EitrDepartExplan struct {
State int `json:"state"` State int `json:"state"`
} }
//获取 // 获取
type LookTargetContListSun struct { type LookTargetContListSun struct {
LookTargetContList LookTargetContList
SunTargetId string `json:"suntargetid"` //子栏目 SunTargetId string `json:"suntargetid"` //子栏目
} }
//
type EiteTargetContListSun struct { type EiteTargetContListSun struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
@ -530,14 +528,14 @@ type EiteTargetContListSun struct {
CensorRate int `json:"censorrate"` //检查频次 CensorRate int `json:"censorrate"` //检查频次
} }
//定性考核列表 // 定性考核列表
type dutyList struct { type dutyList struct {
Group int64 `json:"group" gorm:"column:group;type:bigint(20) unsigned;default:0;not null;comment:集团ID"` Group int64 `json:"group" gorm:"column:group;type:bigint(20) unsigned;default:0;not null;comment:集团ID"`
TargetId int64 `json:"targetid" gorm:"column:targetid;type:bigint(20) unsigned;default:0;not null;comment:指标"` TargetId int64 `json:"targetid" gorm:"column:targetid;type:bigint(20) unsigned;default:0;not null;comment:指标"`
SunTargetId int64 `json:"suntargetid" gorm:"column:suntargetid;type:bigint(20) unsigned;default:0;not null;comment:子栏目ID"` SunTargetId int64 `json:"suntargetid" gorm:"column:suntargetid;type:bigint(20) unsigned;default:0;not null;comment:子栏目ID"`
} }
//定性考核方案新输出 // 定性考核方案新输出
type dutyOutNew struct { type dutyOutNew struct {
Group string `json:"group"` Group string `json:"group"`
Dimension string `json:"dimension"` //维度ID Dimension string `json:"dimension"` //维度ID
@ -552,7 +550,7 @@ type dutyOutNew struct {
CycleAttres int `json:"cycleattr"` //辅助计数"` CycleAttres int `json:"cycleattr"` //辅助计数"`
} }
//查看定性考核列表新型输出 // 查看定性考核列表新型输出
type scanDutyOutList struct { type scanDutyOutList struct {
Id string `json:"id"` Id string `json:"id"`
Group string `json:"group"` Group string `json:"group"`
@ -576,7 +574,7 @@ type scanDutyOutList struct {
DepartNameMap []string `json:"departnamemap"` //子栏目部门 DepartNameMap []string `json:"departnamemap"` //子栏目部门
} }
//部门版本新考核方案输出 // 部门版本新考核方案输出
type departPlanDutyOut struct { type departPlanDutyOut struct {
Id string `json:"id"` //指标ID、 Id string `json:"id"` //指标ID、
Qualevalid string `json:"qualevalid"` //版本号码 Qualevalid string `json:"qualevalid"` //版本号码
@ -614,7 +612,7 @@ type CopyDutyNewCont struct {
Child []CopyEvaluPross `json:"child"` //考核细则 Child []CopyEvaluPross `json:"child"` //考核细则
} }
//指标 // 指标
type CopyEvaluPross struct { type CopyEvaluPross struct {
Id string `json:"id"` //维度ID Id string `json:"id"` //维度ID
Name string `json:"name"` Name string `json:"name"`
@ -625,7 +623,7 @@ type CopyEvaluPross struct {
Istrue int `json:"istrue"` //是否允许修改 Istrue int `json:"istrue"` //是否允许修改
} }
//修改考核目标设定 // 修改考核目标设定
type EiteQuantConfig struct { type EiteQuantConfig struct {
Id string `json:"id"` Id string `json:"id"`
Zeroprize float64 `json:"zeroprize"` //零奖值"` Zeroprize float64 `json:"zeroprize"` //零奖值"`
@ -633,7 +631,7 @@ type EiteQuantConfig struct {
Capping float64 `json:"capping"` //封顶值"` Capping float64 `json:"capping"` //封顶值"`
} }
//删除考核目标设定 // 删除考核目标设定
type DelQuantConfig struct { type DelQuantConfig struct {
Id string `json:"id"` Id string `json:"id"`
} }

8
api/admin/dutyassess/dutyes.go

@ -7,10 +7,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
) )

8
api/admin/dutyassess/dutyhandle.go

@ -7,10 +7,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

8
api/admin/dutyassess/planversio.go

@ -7,10 +7,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

10
api/admin/dutyassess/position.go

@ -1,14 +1,14 @@
package dutyassess package dutyassess
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//岗位考核方案列表 // 岗位考核方案列表
func (d *DutyAssessApi) PositionDepartPlanVersion(c *gin.Context) { func (d *DutyAssessApi) PositionDepartPlanVersion(c *gin.Context) {
var requestData positionPlanVersio var requestData positionPlanVersio
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

6
api/admin/enter.go

@ -1,9 +1,9 @@
package admin package admin
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/api/admin/dutyassess" "gin_server_admin/api/admin/dutyassess"
"github.com/flipped-aurora/gin-vue-admin/server/api/admin/groupmanagement" "gin_server_admin/api/admin/groupmanagement"
"github.com/flipped-aurora/gin-vue-admin/server/api/admin/systemuser" "gin_server_admin/api/admin/systemuser"
) )
type ApiGroup struct { type ApiGroup struct {

20
api/admin/groupmanagement/branchfactorygroup/branchfactory.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -22,7 +22,7 @@ func (b *BranchFactory) Index(c *gin.Context) {
response.Result(0, outPut, "分厂基础设定获取成功", c) response.Result(0, outPut, "分厂基础设定获取成功", c)
} }
//获取分厂栏目 // 获取分厂栏目
func (b *BranchFactory) BranchFactoryList(c *gin.Context) { func (b *BranchFactory) BranchFactoryList(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -93,7 +93,7 @@ func (b *BranchFactory) BranchFactoryList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//添加分厂 // 添加分厂
func (b *BranchFactory) AddBranchFactory(c *gin.Context) { func (b *BranchFactory) AddBranchFactory(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -152,7 +152,7 @@ func (b *BranchFactory) AddBranchFactory(c *gin.Context) {
} }
} }
//获取分厂(部室)详细信息 // 获取分厂(部室)详细信息
func (b *BranchFactory) GetBranchFactory(c *gin.Context) { func (b *BranchFactory) GetBranchFactory(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -179,7 +179,7 @@ func (b *BranchFactory) GetBranchFactory(c *gin.Context) {
response.Result(0, systemBFCont, "数据获取成功!", c) response.Result(0, systemBFCont, "数据获取成功!", c)
} }
//修改分厂内容 // 修改分厂内容
func (b *BranchFactory) EiteBranchFactory(c *gin.Context) { func (b *BranchFactory) EiteBranchFactory(c *gin.Context) {
var requestData EiteBranchFactory var requestData EiteBranchFactory
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -242,7 +242,7 @@ func (b *BranchFactory) EiteBranchFactory(c *gin.Context) {
} }
} }
//编辑分厂数据处理 // 编辑分厂数据处理
func eiteBranchFactoryInfo(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteBranchFactoryInfo(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Master.Model(&testpage.BranchFactory{}).Where("`bf_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Master.Model(&testpage.BranchFactory{}).Where("`bf_id` = ?", saveId).Updates(saveData).Error
@ -253,7 +253,7 @@ func eiteBranchFactoryInfo(saveId int64, saveData map[string]interface{}) (isTru
return return
} }
//删除分厂内容 // 删除分厂内容
func (b *BranchFactory) DelBranchFactory(c *gin.Context) { func (b *BranchFactory) DelBranchFactory(c *gin.Context) {
var requestData delBFType var requestData delBFType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

20
api/admin/groupmanagement/branchfactorygroup/duties.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -20,7 +20,7 @@ func (d *DutiesApi) Index(c *gin.Context) {
response.Result(0, outPut, "职务基础设定入口", c) response.Result(0, outPut, "职务基础设定入口", c)
} }
//职务列表 // 职务列表
func (d *DutiesApi) DutiesList(c *gin.Context) { func (d *DutiesApi) DutiesList(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -95,7 +95,7 @@ func (d *DutiesApi) DutiesList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获取职务信息 // 获取职务信息
func (w *DutiesApi) GetDutiesCont(c *gin.Context) { func (w *DutiesApi) GetDutiesCont(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -122,7 +122,7 @@ func (w *DutiesApi) GetDutiesCont(c *gin.Context) {
response.Result(0, systemBFCont, "数据获取成功!", c) response.Result(0, systemBFCont, "数据获取成功!", c)
} }
//添加职务 // 添加职务
func (w *DutiesApi) AddDutiesCont(c *gin.Context) { func (w *DutiesApi) AddDutiesCont(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -189,7 +189,7 @@ func (w *DutiesApi) AddDutiesCont(c *gin.Context) {
} }
} }
//编辑职务数据处理 // 编辑职务数据处理
func eiteDutiesInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteDutiesInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Master.Model(&testpage.Position{}).Where("`ps_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Master.Model(&testpage.Position{}).Where("`ps_id` = ?", saveId).Updates(saveData).Error
@ -200,7 +200,7 @@ func eiteDutiesInfoes(saveId int64, saveData map[string]interface{}) (isTrue boo
return return
} }
//编辑职务数据 // 编辑职务数据
func (w *DutiesApi) EiteDutiesCont(c *gin.Context) { func (w *DutiesApi) EiteDutiesCont(c *gin.Context) {
var requestData EiteDutiesInfo var requestData EiteDutiesInfo
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -267,7 +267,7 @@ func (w *DutiesApi) EiteDutiesCont(c *gin.Context) {
} }
} }
//删除工段内容 // 删除工段内容
func (w *DutiesApi) DelDutiesCont(c *gin.Context) { func (w *DutiesApi) DelDutiesCont(c *gin.Context) {
var requestData delBFType var requestData delBFType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

22
api/admin/groupmanagement/branchfactorygroup/team.go

@ -4,20 +4,20 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//入口 // 入口
func (t *TeamApi) Index(c *gin.Context) { func (t *TeamApi) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "班组基础设定入口", c) response.Result(0, outPut, "班组基础设定入口", c)
} }
//获取班组列表 // 获取班组列表
func (t *TeamApi) TeamApiList(c *gin.Context) { func (t *TeamApi) TeamApiList(c *gin.Context) {
var requestData TeamList var requestData TeamList
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -40,7 +40,7 @@ func (t *TeamApi) TeamApiList(c *gin.Context) {
response.Result(0, systemRoleList, "数据获取成功!", c) response.Result(0, systemRoleList, "数据获取成功!", c)
} }
//获取班组详细内容 // 获取班组详细内容
func (t *TeamApi) GetTeamContApi(c *gin.Context) { func (t *TeamApi) GetTeamContApi(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -67,7 +67,7 @@ func (t *TeamApi) GetTeamContApi(c *gin.Context) {
response.Result(0, systemBFCont, "数据获取成功!", c) response.Result(0, systemBFCont, "数据获取成功!", c)
} }
//添加班组 // 添加班组
func (t *TeamApi) AddTeamContApi(c *gin.Context) { func (t *TeamApi) AddTeamContApi(c *gin.Context) {
var requestData AddTeam var requestData AddTeam
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -102,7 +102,7 @@ func (t *TeamApi) AddTeamContApi(c *gin.Context) {
} }
} }
//编辑班组数据处理 // 编辑班组数据处理
func eiteTeamInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteTeamInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Master.Model(&testpage.Teaming{}).Where("`tm_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Master.Model(&testpage.Teaming{}).Where("`tm_id` = ?", saveId).Updates(saveData).Error
@ -113,7 +113,7 @@ func eiteTeamInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool,
return return
} }
//修改班组 // 修改班组
func (t *TeamApi) EiteTeamContApi(c *gin.Context) { func (t *TeamApi) EiteTeamContApi(c *gin.Context) {
var requestData EiteTeam var requestData EiteTeam
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -166,7 +166,7 @@ func (t *TeamApi) EiteTeamContApi(c *gin.Context) {
} }
} }
//删除版主内容 // 删除版主内容
func (w *TeamApi) DelTeamCont(c *gin.Context) { func (w *TeamApi) DelTeamCont(c *gin.Context) {
var requestData delBFType var requestData delBFType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

34
api/admin/groupmanagement/branchfactorygroup/type.go

@ -1,11 +1,11 @@
package branchfactorygroup package branchfactorygroup
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
) )
//分厂 // 分厂
type BranchFactory struct{} type BranchFactory struct{}
type BranchFactoryList struct { type BranchFactoryList struct {
commonus.PageSetLimt commonus.PageSetLimt
@ -15,13 +15,13 @@ type BranchFactoryList struct {
Title string `json:"title"` Title string `json:"title"`
} }
//分厂列表输出 // 分厂列表输出
type PrintBranchFactoryList struct { type PrintBranchFactoryList struct {
testpage.BranchFactory testpage.BranchFactory
GroupName string `json:"groupname"` GroupName string `json:"groupname"`
} }
//创建分厂 // 创建分厂
type AddBranchFactory struct { type AddBranchFactory struct {
Title string `json:"title"` Title string `json:"title"`
GroupId int64 `json:"groupid"` GroupId int64 `json:"groupid"`
@ -29,23 +29,23 @@ type AddBranchFactory struct {
Attribute int64 `json:"attribute"` Attribute int64 `json:"attribute"`
} }
//修改分厂信息 // 修改分厂信息
type EiteBranchFactory struct { type EiteBranchFactory struct {
commonus.SetIds commonus.SetIds
AddBranchFactory AddBranchFactory
} }
//删除分厂信息 // 删除分厂信息
type delBFType struct { type delBFType struct {
commonus.SetIds commonus.SetIds
State int `json:"state"` // 状态 State int `json:"state"` // 状态
IsDel int `json:"isdel"` // 是否强制删除 IsDel int `json:"isdel"` // 是否强制删除
} }
//工段 // 工段
type WorkshopSectionApi struct{} type WorkshopSectionApi struct{}
//工段列表 // 工段列表
type WorKSectionList struct { type WorKSectionList struct {
commonus.PageSetLimt commonus.PageSetLimt
GroupId int64 `json:"groupid"` GroupId int64 `json:"groupid"`
@ -54,20 +54,20 @@ type WorKSectionList struct {
Title string `json:"title"` Title string `json:"title"`
} }
//工段列表输出 // 工段列表输出
type WorKSectionListPrint struct { type WorKSectionListPrint struct {
testpage.WorkShopsection testpage.WorkShopsection
GroupName string `json:"groupname"` GroupName string `json:"groupname"`
BranchFactoryName string `json:"branchfactoryname"` BranchFactoryName string `json:"branchfactoryname"`
} }
//添加工段 // 添加工段
type AddWorkSectionInfo struct { type AddWorkSectionInfo struct {
Title string `json:"title"` Title string `json:"title"`
BranchFactoryId int64 `json:"branchfactoryid"` BranchFactoryId int64 `json:"branchfactoryid"`
} }
//编辑工段内容 // 编辑工段内容
type EiteWorkSectionInfo struct { type EiteWorkSectionInfo struct {
commonus.SetIds commonus.SetIds
AddWorkSectionInfo AddWorkSectionInfo
@ -79,14 +79,14 @@ type EiteWorkSectionInfo struct {
type DutiesApi struct{} type DutiesApi struct{}
//添加职务 // 添加职务
type AddDutiesInfo struct { type AddDutiesInfo struct {
AddWorkSectionInfo AddWorkSectionInfo
Weight int64 `json:"weight"` Weight int64 `json:"weight"`
Genexa int64 `json:"genexa"` Genexa int64 `json:"genexa"`
} }
//编辑职务 // 编辑职务
type EiteDutiesInfo struct { type EiteDutiesInfo struct {
commonus.SetIds commonus.SetIds
AddDutiesInfo AddDutiesInfo
@ -97,20 +97,20 @@ type EiteDutiesInfo struct {
*/ */
type TeamApi struct{} type TeamApi struct{}
//班组列表 // 班组列表
type TeamList struct { type TeamList struct {
State int `json:"state"` State int `json:"state"`
Title string `json:"title"` Title string `json:"title"`
Shifts int `json:"shifts"` Shifts int `json:"shifts"`
} }
//添加班组数据录入 // 添加班组数据录入
type AddTeam struct { type AddTeam struct {
Title string `json:"title"` Title string `json:"title"`
Shifts int64 `json:"shifts"` Shifts int64 `json:"shifts"`
} }
//修改班组数据录入 // 修改班组数据录入
type EiteTeam struct { type EiteTeam struct {
commonus.SetIds commonus.SetIds
AddTeam AddTeam

22
api/admin/groupmanagement/branchfactorygroup/workshopsection.go

@ -4,20 +4,20 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//入口 // 入口
func (w *WorkshopSectionApi) Index(c *gin.Context) { func (w *WorkshopSectionApi) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "工段基础设定入口", c) response.Result(0, outPut, "工段基础设定入口", c)
} }
//工段列表 // 工段列表
func (w *WorkshopSectionApi) WorKSection(c *gin.Context) { func (w *WorkshopSectionApi) WorKSection(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -92,7 +92,7 @@ func (w *WorkshopSectionApi) WorKSection(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//添加工段 // 添加工段
func (w *WorkshopSectionApi) AddWorkSectionCont(c *gin.Context) { func (w *WorkshopSectionApi) AddWorkSectionCont(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -148,7 +148,7 @@ func (w *WorkshopSectionApi) AddWorkSectionCont(c *gin.Context) {
} }
} }
//获取工段信息 // 获取工段信息
func (w *WorkshopSectionApi) GetWorkSectionCont(c *gin.Context) { func (w *WorkshopSectionApi) GetWorkSectionCont(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -175,7 +175,7 @@ func (w *WorkshopSectionApi) GetWorkSectionCont(c *gin.Context) {
response.Result(0, systemBFCont, "数据获取成功!", c) response.Result(0, systemBFCont, "数据获取成功!", c)
} }
//修改工段内容 // 修改工段内容
func (w *WorkshopSectionApi) EiteWorkSectionCont(c *gin.Context) { func (w *WorkshopSectionApi) EiteWorkSectionCont(c *gin.Context) {
var requestData EiteWorkSectionInfo var requestData EiteWorkSectionInfo
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -236,7 +236,7 @@ func (w *WorkshopSectionApi) EiteWorkSectionCont(c *gin.Context) {
} }
} }
//编辑工段数据处理 // 编辑工段数据处理
func eiteWorkSectionInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteWorkSectionInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Master.Model(&testpage.WorkShopsection{}).Where("`ws_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Master.Model(&testpage.WorkShopsection{}).Where("`ws_id` = ?", saveId).Updates(saveData).Error
@ -247,7 +247,7 @@ func eiteWorkSectionInfoes(saveId int64, saveData map[string]interface{}) (isTru
return return
} }
//删除工段内容 // 删除工段内容
func (w *WorkshopSectionApi) DelWorkSection(c *gin.Context) { func (w *WorkshopSectionApi) DelWorkSection(c *gin.Context) {
var requestData delBFType var requestData delBFType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

2
api/admin/groupmanagement/enter.go

@ -1,6 +1,6 @@
package groupmanagement package groupmanagement
import "github.com/flipped-aurora/gin-vue-admin/server/api/admin/groupmanagement/branchfactorygroup" import "gin_server_admin/api/admin/groupmanagement/branchfactorygroup"
type ApiGroup struct { type ApiGroup struct {
BranchFactoryApi branchfactorygroup.ApiGroup BranchFactoryApi branchfactorygroup.ApiGroup

34
api/admin/systemuser/adminrole.go

@ -5,15 +5,15 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" "gin_server_admin/model/systemuser"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//角色相关 // 角色相关
//入口 // 入口
func (s *SystemRoleApi) Index(c *gin.Context) { func (s *SystemRoleApi) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "角色管理入口获取成功", c) response.Result(0, outPut, "角色管理入口获取成功", c)
@ -105,7 +105,7 @@ func (s *SystemRoleApi) SystemRoleList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获取角色详细内容 // 获取角色详细内容
func GetAdminRoleInfo(id int64) (isTrue bool, adminRoleInfo systemuser.SystemRole) { func GetAdminRoleInfo(id int64) (isTrue bool, adminRoleInfo systemuser.SystemRole) {
isTrue = false isTrue = false
err := global.GVA_DB_Master.Where("r_id = ?", id).First(&adminRoleInfo).Error err := global.GVA_DB_Master.Where("r_id = ?", id).First(&adminRoleInfo).Error
@ -115,7 +115,7 @@ func GetAdminRoleInfo(id int64) (isTrue bool, adminRoleInfo systemuser.SystemRol
return return
} }
//添加系统角色 // 添加系统角色
func (s *SystemRoleApi) AddSystemRole(c *gin.Context) { func (s *SystemRoleApi) AddSystemRole(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -191,7 +191,7 @@ func (s *SystemRoleApi) AddSystemRole(c *gin.Context) {
} }
} }
//修改系统角色 // 修改系统角色
func (s *SystemRoleApi) EiteSystemRole(c *gin.Context) { func (s *SystemRoleApi) EiteSystemRole(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -260,7 +260,7 @@ func (s *SystemRoleApi) EiteSystemRole(c *gin.Context) {
} }
} }
//删除系统角色 // 删除系统角色
func (s *SystemRoleApi) DelSystemRole(c *gin.Context) { func (s *SystemRoleApi) DelSystemRole(c *gin.Context) {
var requestData delSystemRoleType var requestData delSystemRoleType
@ -311,7 +311,7 @@ func (s *SystemRoleApi) DelSystemRole(c *gin.Context) {
} }
} }
//获取系统角色详情 // 获取系统角色详情
func (s *SystemRoleApi) GetSystemRole(c *gin.Context) { func (s *SystemRoleApi) GetSystemRole(c *gin.Context) {
var requestData commonus.SetId var requestData commonus.SetId
@ -372,7 +372,7 @@ func (s *SystemRoleApi) GetSystemRole(c *gin.Context) {
response.Result(0, printRoleCont, "数据获取成功!", c) response.Result(0, printRoleCont, "数据获取成功!", c)
} }
//编辑角色数据处理 // 编辑角色数据处理
func eiteSystemRoleCont(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteSystemRoleCont(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Master.Model(&systemuser.SystemRole{}).Where("`r_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Master.Model(&systemuser.SystemRole{}).Where("`r_id` = ?", saveId).Updates(saveData).Error
@ -383,7 +383,7 @@ func eiteSystemRoleCont(saveId int64, saveData map[string]interface{}) (isTrue b
return return
} }
//获取角色权限配置清单 // 获取角色权限配置清单
func (s *SystemRoleApi) GetPowerConfig(c *gin.Context) { func (s *SystemRoleApi) GetPowerConfig(c *gin.Context) {
var requestData commonus.SetId var requestData commonus.SetId
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -411,7 +411,7 @@ func (s *SystemRoleApi) GetPowerConfig(c *gin.Context) {
response.Result(0, datahhh, "数据获取失败!", c) response.Result(0, datahhh, "数据获取失败!", c)
} }
//遍历确权 // 遍历确权
func GetMenuOperation(menuStr, menuOperStr string) (isTrue bool, sendData []powerConfigList) { func GetMenuOperation(menuStr, menuOperStr string) (isTrue bool, sendData []powerConfigList) {
isTrue = false isTrue = false
var menuStrMap []string var menuStrMap []string
@ -430,7 +430,7 @@ func GetMenuOperation(menuStr, menuOperStr string) (isTrue bool, sendData []powe
return return
} }
//递归无限树 // 递归无限树
func GetMenuPowerThree(jurisd int, parentId int64, threeData []systemuser.SystemMenu, menuStrMap, menuOperStrMap []string) []powerConfigList { func GetMenuPowerThree(jurisd int, parentId int64, threeData []systemuser.SystemMenu, menuStrMap, menuOperStrMap []string) []powerConfigList {
// treeList := []SystemMenuThree{} // treeList := []SystemMenuThree{}
treeListPower := []powerConfigList{} treeListPower := []powerConfigList{}
@ -461,7 +461,7 @@ func GetMenuPowerThree(jurisd int, parentId int64, threeData []systemuser.System
return treeListPower return treeListPower
} }
//判断值是否在数组中 // 判断值是否在数组中
func JudeInArray(id int64, ary []string) (isTrue bool) { func JudeInArray(id int64, ary []string) (isTrue bool) {
isTrue = false isTrue = false
for _, val := range ary { for _, val := range ary {
@ -475,7 +475,7 @@ func JudeInArray(id int64, ary []string) (isTrue bool) {
return return
} }
//配置角色权限 // 配置角色权限
func (s *SystemRoleApi) SetPowerConfig(c *gin.Context) { func (s *SystemRoleApi) SetPowerConfig(c *gin.Context) {
var requestData SetPowerCont var requestData SetPowerCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

20
api/admin/systemuser/menutype.go

@ -1,17 +1,17 @@
package systemuser package systemuser
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" "gin_server_admin/model/systemuser"
) )
//查询角色列表 // 查询角色列表
type menuList struct { type menuList struct {
commonus.PageSetLimt commonus.PageSetLimt
Title string `json:"title"` Title string `json:"title"`
} }
//输出角色列表 // 输出角色列表
type printRoleList struct { type printRoleList struct {
systemuser.SystemRole systemuser.SystemRole
GroupName string `json:"groupname"` GroupName string `json:"groupname"`
@ -20,20 +20,20 @@ type printRoleList struct {
MenuoperPower []string `json:"jmenuoperpower"` MenuoperPower []string `json:"jmenuoperpower"`
} }
//添加角色获取数据 // 添加角色获取数据
type addSystemRoleType struct { type addSystemRoleType struct {
Name string `json:"name"` //角色名称 Name string `json:"name"` //角色名称
Group int `json:"group"` //顶级归属 Group int `json:"group"` //顶级归属
GroupSun int `json:"groupsun"` //次级归属 GroupSun int `json:"groupsun"` //次级归属
} }
//修改系统角色 // 修改系统角色
type eiteSystemRoleType struct { type eiteSystemRoleType struct {
commonus.SetIds commonus.SetIds
addSystemRoleType addSystemRoleType
} }
//删除角色 // 删除角色
type delSystemRoleType struct { type delSystemRoleType struct {
commonus.SetIds commonus.SetIds
State int `json:"state"` // 状态 State int `json:"state"` // 状态
@ -50,19 +50,19 @@ type powerCont struct {
IsTrue bool `json:"istrue"` IsTrue bool `json:"istrue"`
} }
//权限树 // 权限树
type powerConfigList struct { type powerConfigList struct {
powerCont powerCont
Child []powerConfigList `json:"child"` Child []powerConfigList `json:"child"`
MenuOperation []powerCont `json:"menuOperation"` MenuOperation []powerCont `json:"menuOperation"`
} }
//ID映射用 // ID映射用
type powerStrToInt struct { type powerStrToInt struct {
val int64 `json:"val"` val int64 `json:"val"`
} }
//获取配置权限参数 // 获取配置权限参数
type SetPowerCont struct { type SetPowerCont struct {
commonus.SetIds commonus.SetIds
Menu string `json:"menu"` Menu string `json:"menu"`

30
api/admin/systemuser/systemmenu.go

@ -4,14 +4,14 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" "gin_server_admin/model/systemuser"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//菜单相关 // 菜单相关
func (s *SysTemMenuApi) SystemMenuList(c *gin.Context) { func (s *SysTemMenuApi) SystemMenuList(c *gin.Context) {
// response.Result(101, global.Gva_Authority_Authentication, "数据获取失败!", c) // response.Result(101, global.Gva_Authority_Authentication, "数据获取失败!", c)
var systemMenuList []systemuser.SystemMenu var systemMenuList []systemuser.SystemMenu
@ -26,7 +26,7 @@ func (s *SysTemMenuApi) SystemMenuList(c *gin.Context) {
response.Result(0, sendData, "数据获取成功!", c) response.Result(0, sendData, "数据获取成功!", c)
} }
//递归无限树 // 递归无限树
func GetMenuThree(jurisd int, parentId int64, threeData []systemuser.SystemMenu) []SystemMenuThree { func GetMenuThree(jurisd int, parentId int64, threeData []systemuser.SystemMenu) []SystemMenuThree {
treeList := []SystemMenuThree{} treeList := []SystemMenuThree{}
for _, v := range threeData { for _, v := range threeData {
@ -54,7 +54,7 @@ func GetMenuThree(jurisd int, parentId int64, threeData []systemuser.SystemMenu)
return treeList return treeList
} }
//获取菜单操作项目 // 获取菜单操作项目
func MenuOperation(jurisd int, menuId int64) (isTrue bool, operation []systemuser.MenuOperation) { func MenuOperation(jurisd int, menuId int64) (isTrue bool, operation []systemuser.MenuOperation) {
isTrue = false isTrue = false
if jurisd != 1 { if jurisd != 1 {
@ -71,7 +71,7 @@ func MenuOperation(jurisd int, menuId int64) (isTrue bool, operation []systemuse
return return
} }
//获取左侧菜单栏 // 获取左侧菜单栏
func (s *SysTemMenuApi) GetMenu(c *gin.Context) { func (s *SysTemMenuApi) GetMenu(c *gin.Context) {
var systemMenuList []systemuser.SystemMenu var systemMenuList []systemuser.SystemMenu
menuOperErr := global.GVA_DB_Master.Where("`m_steat` IN ? AND m_id IN ?", []int{1, 2}, global.Gva_Authority_Authentication_Subsidiary).Order("m_id desc").Find(&systemMenuList).Error menuOperErr := global.GVA_DB_Master.Where("`m_steat` IN ? AND m_id IN ?", []int{1, 2}, global.Gva_Authority_Authentication_Subsidiary).Order("m_id desc").Find(&systemMenuList).Error
@ -85,7 +85,7 @@ func (s *SysTemMenuApi) GetMenu(c *gin.Context) {
response.Result(0, sendData, "数据获取成功!", c) response.Result(0, sendData, "数据获取成功!", c)
} }
//菜单列表(不带操作) // 菜单列表(不带操作)
func (s *SysTemMenuApi) GetMenuList(c *gin.Context) { func (s *SysTemMenuApi) GetMenuList(c *gin.Context) {
var systemMenuList []systemuser.SystemMenu var systemMenuList []systemuser.SystemMenu
menuOperErr := global.GVA_DB_Master.Where("`m_steat` IN ? AND `m_parent` = 0", []int{1, 2}).Order("m_sort asc").Order("m_id desc").Find(&systemMenuList).Error menuOperErr := global.GVA_DB_Master.Where("`m_steat` IN ? AND `m_parent` = 0", []int{1, 2}).Order("m_sort asc").Order("m_id desc").Find(&systemMenuList).Error
@ -99,7 +99,7 @@ func (s *SysTemMenuApi) GetMenuList(c *gin.Context) {
response.Result(0, sendData, "数据获取成功!", c) response.Result(0, sendData, "数据获取成功!", c)
} }
//添加菜单 // 添加菜单
func (s *SysTemMenuApi) AddMenu(c *gin.Context) { func (s *SysTemMenuApi) AddMenu(c *gin.Context) {
// isTrue, userCont := commonus.AdminClientIdentity() // isTrue, userCont := commonus.AdminClientIdentity()
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
@ -160,7 +160,7 @@ func (s *SysTemMenuApi) AddMenu(c *gin.Context) {
} }
} }
//修改菜单 // 修改菜单
func (s *SysTemMenuApi) EiteMenu(c *gin.Context) { func (s *SysTemMenuApi) EiteMenu(c *gin.Context) {
// isTrue, _ := commonus.AdminClientIdentity() // isTrue, _ := commonus.AdminClientIdentity()
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
@ -222,14 +222,14 @@ func (s *SysTemMenuApi) EiteMenu(c *gin.Context) {
response.Result(0, saveData, "修改成功!", c) response.Result(0, saveData, "修改成功!", c)
} }
//菜单编辑操作 // 菜单编辑操作
func eiteAssEssInfoCont(saveId int64, saveData map[string]interface{}) (menuErr error) { func eiteAssEssInfoCont(saveId int64, saveData map[string]interface{}) (menuErr error) {
var menuCont systemuser.SystemMenu var menuCont systemuser.SystemMenu
menuErr = global.GVA_DB_Master.Model(&menuCont).Where("m_id = ?", saveId).Updates(saveData).Error menuErr = global.GVA_DB_Master.Model(&menuCont).Where("m_id = ?", saveId).Updates(saveData).Error
return return
} }
//菜单删除 // 菜单删除
func (s *SysTemMenuApi) DelMenu(c *gin.Context) { func (s *SysTemMenuApi) DelMenu(c *gin.Context) {
// isTrue, _ := commonus.AdminClientIdentity() // isTrue, _ := commonus.AdminClientIdentity()
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
@ -286,7 +286,7 @@ func (s *SysTemMenuApi) DelMenu(c *gin.Context) {
} }
} }
//添加菜单操作 // 添加菜单操作
func (s *SysTemMenuApi) AddMenuOperation(c *gin.Context) { func (s *SysTemMenuApi) AddMenuOperation(c *gin.Context) {
// isTrue, _ := commonus.AdminClientIdentity() // isTrue, _ := commonus.AdminClientIdentity()
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
@ -333,7 +333,7 @@ func (s *SysTemMenuApi) AddMenuOperation(c *gin.Context) {
} }
} }
//删除菜单操作 // 删除菜单操作
func (s *SysTemMenuApi) DelMenuOperation(c *gin.Context) { func (s *SysTemMenuApi) DelMenuOperation(c *gin.Context) {
// isTrue, _ := commonus.AdminClientIdentity() // isTrue, _ := commonus.AdminClientIdentity()
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()

34
api/admin/systemuser/userhandle.go

@ -4,22 +4,22 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" "gin_server_admin/model/systemuser"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/flipped-aurora/gin-vue-admin/server/model/wechat" "gin_server_admin/model/wechat"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//系统相关 // 系统相关
func (s *SystemUserApi) Index(c *gin.Context) { func (s *SystemUserApi) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "获取成功", c) response.Result(0, outPut, "获取成功", c)
} }
//管理员列表 // 管理员列表
func (s *SystemUserApi) AdminList(c *gin.Context) { func (s *SystemUserApi) AdminList(c *gin.Context) {
var requestData adminRequest var requestData adminRequest
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -118,7 +118,7 @@ func (s *SystemUserApi) AdminList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获取管理员详细内容登录 // 获取管理员详细内容登录
func GetSysAdminLoginInfo(userName, userPwd string) (isTrue bool, sysAdminInfo adminOutInfo) { func GetSysAdminLoginInfo(userName, userPwd string) (isTrue bool, sysAdminInfo adminOutInfo) {
isTrue = false isTrue = false
var md5JiaMi commonus.Md5Encryption var md5JiaMi commonus.Md5Encryption
@ -176,7 +176,7 @@ func GetSysAdminLoginInfo(userName, userPwd string) (isTrue bool, sysAdminInfo a
return return
} }
//获取管理员分组列表 // 获取管理员分组列表
func (s *SystemUserApi) SystemAdminGroupList(c *gin.Context) { func (s *SystemUserApi) SystemAdminGroupList(c *gin.Context) {
isTrue, SysAdminCont := commonus.AdminClientIdentity() isTrue, SysAdminCont := commonus.AdminClientIdentity()
if isTrue != true { if isTrue != true {
@ -231,7 +231,7 @@ func (s *SystemUserApi) SystemAdminGroupList(c *gin.Context) {
response.Result(0, systemAdminGroup, "查询成功!", c) response.Result(0, systemAdminGroup, "查询成功!", c)
} }
//根据具体获取分厂结构及管理角色 // 根据具体获取分厂结构及管理角色
func groupBfRole(groupId int64) (isTrue bool, bfRoleAry []SystemAdminGroup) { func groupBfRole(groupId int64) (isTrue bool, bfRoleAry []SystemAdminGroup) {
isTrue = false isTrue = false
var branchFactory []testpage.BranchFactory var branchFactory []testpage.BranchFactory
@ -254,7 +254,7 @@ func groupBfRole(groupId int64) (isTrue bool, bfRoleAry []SystemAdminGroup) {
return return
} }
//获取分厂角色 // 获取分厂角色
func GetBfRole(bfId int64) (isTrue bool, bfRoleAry []SystemAdminGroup) { func GetBfRole(bfId int64) (isTrue bool, bfRoleAry []SystemAdminGroup) {
isTrue = false isTrue = false
var branchFactory []systemuser.SystemRole var branchFactory []systemuser.SystemRole
@ -273,7 +273,7 @@ func GetBfRole(bfId int64) (isTrue bool, bfRoleAry []SystemAdminGroup) {
return return
} }
//添加系统管理员 // 添加系统管理员
func (s *SystemUserApi) AddSystemAdmin(c *gin.Context) { func (s *SystemUserApi) AddSystemAdmin(c *gin.Context) {
var requestData AddSysAdmin var requestData AddSysAdmin
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -356,7 +356,7 @@ func (s *SystemUserApi) AddSystemAdmin(c *gin.Context) {
} }
} }
//获取管理员信息 // 获取管理员信息
func (s *SystemUserApi) GetSystemAdminCont(c *gin.Context) { func (s *SystemUserApi) GetSystemAdminCont(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -428,7 +428,7 @@ func (s *SystemUserApi) GetSystemAdminCont(c *gin.Context) {
response.Result(0, sysAdminInfo, "该用户不存在!", c) response.Result(0, sysAdminInfo, "该用户不存在!", c)
} }
//修改管理员 // 修改管理员
func (s *SystemUserApi) EiteSystemAdminCont(c *gin.Context) { func (s *SystemUserApi) EiteSystemAdminCont(c *gin.Context) {
var requestData EiteSysAdmin var requestData EiteSysAdmin
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -503,7 +503,7 @@ func (s *SystemUserApi) EiteSystemAdminCont(c *gin.Context) {
} }
} }
//编辑系统管理员数据处理 // 编辑系统管理员数据处理
func eiteSystemAdminCont(saveId int64, saveData, saveDataAttr map[string]interface{}) (isTrue bool, affairDbErr error) { func eiteSystemAdminCont(saveId int64, saveData, saveDataAttr map[string]interface{}) (isTrue bool, affairDbErr error) {
isTrue = false isTrue = false
affairDb := global.GVA_DB_Master.Begin() affairDb := global.GVA_DB_Master.Begin()
@ -523,7 +523,7 @@ func eiteSystemAdminCont(saveId int64, saveData, saveDataAttr map[string]interfa
return return
} }
//删除系统管理员 // 删除系统管理员
func (s *SystemUserApi) DelSystemAdmin(c *gin.Context) { func (s *SystemUserApi) DelSystemAdmin(c *gin.Context) {
var requestData delSystemRoleType var requestData delSystemRoleType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

28
api/admin/systemuser/usertype.go

@ -1,13 +1,13 @@
package systemuser package systemuser
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" "gin_server_admin/model/systemuser"
) )
type SystemUserApi struct{} type SystemUserApi struct{}
//管理员列表查询 // 管理员列表查询
type adminRequest struct { type adminRequest struct {
commonus.PageSetLimt commonus.PageSetLimt
GroupId int `json:"groupId"` GroupId int `json:"groupId"`
@ -17,7 +17,7 @@ type adminRequest struct {
UserName string `json:"username"` UserName string `json:"username"`
} }
//管理员输出 // 管理员输出
type adminOutInfo struct { type adminOutInfo struct {
systemuser.SystemAdminDetails systemuser.SystemAdminDetails
RoleName string `json:"roleName"` RoleName string `json:"roleName"`
@ -29,13 +29,13 @@ type adminOutInfo struct {
Wand int `json:"wand"` Wand int `json:"wand"`
} }
//角色相关 // 角色相关
type SystemRoleApi struct{} type SystemRoleApi struct{}
//菜单相关 // 菜单相关
type SysTemMenuApi struct{} type SysTemMenuApi struct{}
//菜单递给 // 菜单递给
type SystemMenuThree struct { type SystemMenuThree struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Title string `json:"title"` Title string `json:"title"`
@ -50,12 +50,12 @@ type SystemMenuThree struct {
MenuOperation []systemuser.MenuOperation `json:"menuOperation"` MenuOperation []systemuser.MenuOperation `json:"menuOperation"`
} }
//查询菜单列表 // 查询菜单列表
type getMenuData struct { type getMenuData struct {
StateOperation int `json:"stateOperation"` StateOperation int `json:"stateOperation"`
} }
//添加菜单参数 // 添加菜单参数
type addMenuData struct { type addMenuData struct {
Title string `json:"title"` Title string `json:"title"`
ParentId int `json:"parentId"` ParentId int `json:"parentId"`
@ -63,7 +63,7 @@ type addMenuData struct {
Sort int `json:"sort"` Sort int `json:"sort"`
} }
//修改菜单参数 // 修改菜单参数
type eiteMenuData struct { type eiteMenuData struct {
Id int `json:"id"` Id int `json:"id"`
Title string `json:"title"` Title string `json:"title"`
@ -72,13 +72,13 @@ type eiteMenuData struct {
Sort int `json:"sort"` Sort int `json:"sort"`
} }
//添加菜单功能操作 // 添加菜单功能操作
type addMenuOper struct { type addMenuOper struct {
MenuId string `json:"menuid"` MenuId string `json:"menuid"`
Title string `json:"title"` Title string `json:"title"`
} }
//管理员分组 // 管理员分组
type SystemAdminGroupSun struct { type SystemAdminGroupSun struct {
commonus.SetIds commonus.SetIds
Title string `json:"title"` Title string `json:"title"`
@ -88,7 +88,7 @@ type SystemAdminGroup struct {
Child []SystemAdminGroup `json:"child"` Child []SystemAdminGroup `json:"child"`
} }
//添加管理员 // 添加管理员
type AddSysAdmin struct { type AddSysAdmin struct {
UserName string `json:"username"` UserName string `json:"username"`
Password string `json:"password"` Password string `json:"password"`
@ -99,7 +99,7 @@ type AddSysAdmin struct {
Tel string `json:"tel"` Tel string `json:"tel"`
} }
//编辑管理员 // 编辑管理员
type EiteSysAdmin struct { type EiteSysAdmin struct {
commonus.SetIds commonus.SetIds
UserName string `json:"username"` UserName string `json:"username"`

58
api/index/assessment/assesshandle.go

@ -6,27 +6,27 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/assessment" "gin_server_admin/api/v1/assessment"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" "gin_server_admin/model/systemuser"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/flipped-aurora/gin-vue-admin/server/utils/redishandel" "gin_server_admin/utils/redishandel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
) )
//考核入口 // 考核入口
func (a *Assessment) Index(c *gin.Context) { func (a *Assessment) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "用户端获取成功", c) response.Result(0, outPut, "用户端获取成功", c)
} }
//扫码登录回传 // 扫码登录回传
func (a *Assessment) ScanCode(c *gin.Context) { func (a *Assessment) ScanCode(c *gin.Context) {
var requestData scanCodeStr var requestData scanCodeStr
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -117,7 +117,7 @@ func (a *Assessment) ScanCodeOld(c *gin.Context) {
response.Result(0, sendData, "用户端获取成功", c) response.Result(0, sendData, "用户端获取成功", c)
} }
//获取要考核的列表 // 获取要考核的列表
func (a *Assessment) MyAssEssMentList(c *gin.Context) { func (a *Assessment) MyAssEssMentList(c *gin.Context) {
var requestData getAssEssList var requestData getAssEssList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -199,7 +199,7 @@ func (a *Assessment) MyAssEssMentList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获得项目考核部门 // 获得项目考核部门
func GetAssDepart(dutyid int64, dataStr string) (isTrue bool, assessDepartstr []assessDepart) { func GetAssDepart(dutyid int64, dataStr string) (isTrue bool, assessDepartstr []assessDepart) {
isTrue = false isTrue = false
var departDuty []assessmentmodel.DepartDuty var departDuty []assessmentmodel.DepartDuty
@ -230,7 +230,7 @@ func GetAssDepart(dutyid int64, dataStr string) (isTrue bool, assessDepartstr []
return return
} }
//判断部门指定月份是否已经考核完毕 // 判断部门指定月份是否已经考核完毕
func JudgeResAssEssExam(dutyId, departId int64, monthTimeStr string) (isTrue bool) { func JudgeResAssEssExam(dutyId, departId int64, monthTimeStr string) (isTrue bool) {
isTrue = false isTrue = false
// var departscores assessmentmodel.Departscores // var departscores assessmentmodel.Departscores
@ -248,7 +248,7 @@ func JudgeResAssEssExam(dutyId, departId int64, monthTimeStr string) (isTrue boo
return return
} }
//根据具体考核项获取被考核部门 // 根据具体考核项获取被考核部门
func (a *Assessment) GetDutyDepartList(c *gin.Context) { func (a *Assessment) GetDutyDepartList(c *gin.Context) {
var requestData assessDepartRequest var requestData assessDepartRequest
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -277,7 +277,7 @@ func (a *Assessment) GetDutyDepartList(c *gin.Context) {
response.Result(0, outData, "查询成功!", c) response.Result(0, outData, "查询成功!", c)
} }
//添加考核评分 // 添加考核评分
func (a *Assessment) AddAssessmentScore(c *gin.Context) { func (a *Assessment) AddAssessmentScore(c *gin.Context) {
var requestData addAssEssScores var requestData addAssEssScores
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -401,7 +401,7 @@ func (a *Assessment) AddAssessmentScore(c *gin.Context) {
} }
} }
//我的评价记录 // 我的评价记录
func (a *Assessment) MyEvaluateList(c *gin.Context) { func (a *Assessment) MyEvaluateList(c *gin.Context) {
var requestData usEvaluate var requestData usEvaluate
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -481,7 +481,7 @@ func (a *Assessment) MyEvaluateList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//根据部门和时间获取考核详情 // 根据部门和时间获取考核详情
func (a *Assessment) GetDepartTimeAssess(c *gin.Context) { func (a *Assessment) GetDepartTimeAssess(c *gin.Context) {
var requestData departTimeAssess var requestData departTimeAssess
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -571,7 +571,7 @@ func (a *Assessment) GetDepartTimeAssess(c *gin.Context) {
response.Result(0, outPrint, "获取成功!", c) response.Result(0, outPrint, "获取成功!", c)
} }
//获取考核项目列表 // 获取考核项目列表
func GetAssList(classId, depart, timeVal int64) (isTrue bool, departMonthAss []departMonthSun) { func GetAssList(classId, depart, timeVal int64) (isTrue bool, departMonthAss []departMonthSun) {
isTrue = false isTrue = false
var departScorsList []assessmentmodel.Departscores var departScorsList []assessmentmodel.Departscores
@ -597,7 +597,7 @@ func GetAssList(classId, depart, timeVal int64) (isTrue bool, departMonthAss []d
return return
} }
//获取具体考核项目 // 获取具体考核项目
func GetDetailedDuty(classId, assId, depart, timeVal int64) (isTrue bool, departMonthUser []departMonthSun) { func GetDetailedDuty(classId, assId, depart, timeVal int64) (isTrue bool, departMonthUser []departMonthSun) {
isTrue = false isTrue = false
var departScorsList []commentUser var departScorsList []commentUser
@ -632,7 +632,7 @@ func GetDetailedDuty(classId, assId, depart, timeVal int64) (isTrue bool, depart
return return
} }
//获取考核具体职责项目 // 获取考核具体职责项目
func GetDutyContAry(classId, assId, depart, userKey, timeVal int64) (isTrue bool, dutyList []departDutyList) { func GetDutyContAry(classId, assId, depart, userKey, timeVal int64) (isTrue bool, dutyList []departDutyList) {
// fmt.Printf("--->%v--->%v\n", classId, assId) // fmt.Printf("--->%v--->%v\n", classId, assId)
isTrue = false isTrue = false
@ -670,7 +670,7 @@ func GetDutyContAry(classId, assId, depart, userKey, timeVal int64) (isTrue bool
return return
} }
//获取职责类别内容 // 获取职责类别内容
func GetDutyInfoCont(id int64) (isTrue bool, outAssDutyInfo outAessDuty) { func GetDutyInfoCont(id int64) (isTrue bool, outAssDutyInfo outAessDuty) {
isTrue = false isTrue = false
var ContInfo dutyAssClass var ContInfo dutyAssClass
@ -690,7 +690,7 @@ func GetDutyInfoCont(id int64) (isTrue bool, outAssDutyInfo outAessDuty) {
return return
} }
//以部门为维度获取考核项目 // 以部门为维度获取考核项目
func (a *Assessment) DepartmentAssess(c *gin.Context) { func (a *Assessment) DepartmentAssess(c *gin.Context) {
var requestData departAssessType var requestData departAssessType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -758,7 +758,7 @@ func (a *Assessment) DepartmentAssess(c *gin.Context) {
response.Result(0, outContMap, "查询成功!", c) response.Result(0, outContMap, "查询成功!", c)
} }
//以部门为基准填写考核数据 // 以部门为基准填写考核数据
func (a *Assessment) DepartmentAssessData(c *gin.Context) { func (a *Assessment) DepartmentAssessData(c *gin.Context) {
var requestData DepartDutyData var requestData DepartDutyData
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -949,7 +949,7 @@ func (a *Assessment) DepartmentAssessData(c *gin.Context) {
} }
} }
//查看审批详细内容 // 查看审批详细内容
func (a *Assessment) LookDepartmentAssessInfo(c *gin.Context) { func (a *Assessment) LookDepartmentAssessInfo(c *gin.Context) {
var requestData LookDutyCont var requestData LookDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1031,7 +1031,7 @@ func (a *Assessment) LookDepartmentAssessInfo(c *gin.Context) {
response.Result(0, outContMap, "数据写入成功!", c) response.Result(0, outContMap, "数据写入成功!", c)
} }
//查询自建应用审批单当前状态 // 查询自建应用审批单当前状态
func (a *Assessment) LookOpenApprovalDataInfo(c *gin.Context) { func (a *Assessment) LookOpenApprovalDataInfo(c *gin.Context) {
var requestData LookDutyCont var requestData LookDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1074,7 +1074,7 @@ func (a *Assessment) LookOpenApprovalDataInfo(c *gin.Context) {
response.Result(0, jsonToOpenApprovalStruct, "查询成功!", c) response.Result(0, jsonToOpenApprovalStruct, "查询成功!", c)
} }
//查看本部门提交的和个人提交的审批 // 查看本部门提交的和个人提交的审批
func (a *Assessment) LookPersonalOrDepartment(c *gin.Context) { func (a *Assessment) LookPersonalOrDepartment(c *gin.Context) {
var requestData commonus.PageSetLimt var requestData commonus.PageSetLimt
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1153,7 +1153,7 @@ func (a *Assessment) LookPersonalOrDepartment(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获取班组列表 // 获取班组列表
func (a *Assessment) GetTeamList(c *gin.Context) { func (a *Assessment) GetTeamList(c *gin.Context) {
var teamList []testpage.Teaming var teamList []testpage.Teaming
err := global.GVA_DB_Master.Order("tm_long ASC,tm_id ASC").Find(&teamList).Error err := global.GVA_DB_Master.Order("tm_long ASC,tm_id ASC").Find(&teamList).Error

56
api/index/assessment/assesstype.go

@ -3,37 +3,37 @@ package assessment
import ( import (
"sync" "sync"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//考核 // 考核
type Assessment struct{} type Assessment struct{}
//协程设置 // 协程设置
var synergeticProcess = sync.WaitGroup{} var synergeticProcess = sync.WaitGroup{}
//数据锁统计 // 数据锁统计
type dataLockStatistics struct { type dataLockStatistics struct {
dataMap []map[string]interface{} dataMap []map[string]interface{}
mutext sync.RWMutex mutext sync.RWMutex
} }
//读取锁数据 // 读取锁数据
func (d *dataLockStatistics) readDataLock() []map[string]interface{} { func (d *dataLockStatistics) readDataLock() []map[string]interface{} {
d.mutext.RLock() d.mutext.RLock()
defer d.mutext.RUnlock() defer d.mutext.RUnlock()
return d.dataMap return d.dataMap
} }
//列表参数 // 列表参数
type getAssEssList struct { type getAssEssList struct {
commonus.PageSetLimt commonus.PageSetLimt
BranchFactoryId int `json:"branchFactoryId"` BranchFactoryId int `json:"branchFactoryId"`
DayState int `json:"daystate"` DayState int `json:"daystate"`
} }
//考核项目输出 // 考核项目输出
type assessOut struct { type assessOut struct {
assessmentmodel.DutyContent assessmentmodel.DutyContent
ClassId int64 `json:"classId"` ClassId int64 `json:"classId"`
@ -44,7 +44,7 @@ type assessOut struct {
OutId string `json:"outId"` OutId string `json:"outId"`
} }
//要考核的部门评分 // 要考核的部门评分
type assessDepart struct { type assessDepart struct {
DepartDutyId int64 `json:"departDutyId"` DepartDutyId int64 `json:"departDutyId"`
DepartId int64 `json:"departId"` DepartId int64 `json:"departId"`
@ -57,12 +57,12 @@ type assessDepart struct {
IsTrue bool `json:"istrue"` IsTrue bool `json:"istrue"`
} }
//更具具体考核项目获取考核部门 // 更具具体考核项目获取考核部门
type assessDepartRequest struct { type assessDepartRequest struct {
Id string `json:"id"` Id string `json:"id"`
} }
//添加考核评分 // 添加考核评分
type addAssEssScore struct { type addAssEssScore struct {
ClassId string `json:"classID"` //考核分类 ClassId string `json:"classID"` //考核分类
AssessId string `json:"assessId"` //考核项目 AssessId string `json:"assessId"` //考核项目
@ -90,13 +90,13 @@ type addAssEssScores struct {
CommentUser string `json:"commentUser"` //评论人 CommentUser string `json:"commentUser"` //评论人
} }
//获取部门时间考核详情 // 获取部门时间考核详情
type departTimeAssess struct { type departTimeAssess struct {
DepartId int64 `json:"departId"` DepartId int64 `json:"departId"`
Time string `json:"time"` Time string `json:"time"`
} }
//查询个人评价列表 // 查询个人评价列表
type usEvaluate struct { type usEvaluate struct {
commonus.PageSetLimt commonus.PageSetLimt
departTimeAssess departTimeAssess
@ -109,14 +109,14 @@ type usEvaluateOutList struct {
Score int `json:"sumscore" gorm:"column:sumscore;type:int(3) unsigned;default:0;not null;comment:实际得分"` Score int `json:"sumscore" gorm:"column:sumscore;type:int(3) unsigned;default:0;not null;comment:实际得分"`
} }
//个人评价列表输出 // 个人评价列表输出
type usEvaluateOut struct { type usEvaluateOut struct {
usEvaluateOutList usEvaluateOutList
FileTimeStr string `json:"timeStr"` FileTimeStr string `json:"timeStr"`
DepartTitle string `json:"departTitle"` DepartTitle string `json:"departTitle"`
} }
//部门月份考核详细输出 // 部门月份考核详细输出
type departDataAssess struct { type departDataAssess struct {
assessmentmodel.Departscores assessmentmodel.Departscores
FileTimeStr string `json:"timeStr"` FileTimeStr string `json:"timeStr"`
@ -124,7 +124,7 @@ type departDataAssess struct {
outAessDuty outAessDuty
} }
//输出考核关系架构 // 输出考核关系架构
type outAessDuty struct { type outAessDuty struct {
ClassId int64 `json:"classId"` ClassId int64 `json:"classId"`
ClassTitle string `json:"classTitle"` ClassTitle string `json:"classTitle"`
@ -133,7 +133,7 @@ type outAessDuty struct {
DutyTitle string `json:"dutyTitle"` DutyTitle string `json:"dutyTitle"`
} }
//具体职责项与考核项目,类别 // 具体职责项与考核项目,类别
type dutyAssClass struct { type dutyAssClass struct {
Title string `json:"title" gorm:"column:dc_title;type:text;comment:具体职责"` Title string `json:"title" gorm:"column:dc_title;type:text;comment:具体职责"`
PartId int64 `json:"partId" gorm:"column:dc_parent;type:bigint(20) unsigned;default:0;not null;comment:父级"` PartId int64 `json:"partId" gorm:"column:dc_parent;type:bigint(20) unsigned;default:0;not null;comment:父级"`
@ -142,7 +142,7 @@ type dutyAssClass struct {
ClassTitle string `json:"Classtitle" gorm:"column:title;type:varchar(255);comment:职责类别名称"` ClassTitle string `json:"Classtitle" gorm:"column:title;type:varchar(255);comment:职责类别名称"`
} }
//部门月份具体考核详情 // 部门月份具体考核详情
type departMonth struct { type departMonth struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Title string `json:"title"` Title string `json:"title"`
@ -161,19 +161,19 @@ type departDutyList struct {
DutyTitle string `json:"dutyTitle"` DutyTitle string `json:"dutyTitle"`
} }
//归档审批人 // 归档审批人
type commentUser struct { type commentUser struct {
UserKey int64 `json:"userkey" gorm:"column:s_comment_user;type:bigint(20) unsigned;default:0;not null;comment:评论人"` UserKey int64 `json:"userkey" gorm:"column:s_comment_user;type:bigint(20) unsigned;default:0;not null;comment:评论人"`
} }
//部门维度考核 // 部门维度考核
type departAssessType struct { type departAssessType struct {
DepartmentId int `json:"departmentid"` DepartmentId int `json:"departmentid"`
GroupId int `json:"groupid"` GroupId int `json:"groupid"`
DayState int `json:"daystate"` DayState int `json:"daystate"`
} }
//查询输出 // 查询输出
type departAssessOutType struct { type departAssessOutType struct {
assessmentmodel.DepartDuty assessmentmodel.DepartDuty
Titles string `json:"titles" gorm:"column:dc_title;type:text;comment:具体职责"` Titles string `json:"titles" gorm:"column:dc_title;type:text;comment:具体职责"`
@ -187,7 +187,7 @@ type departAssessOutType struct {
OutID string `json:"outid"` OutID string `json:"outid"`
} }
//以部门为单位提报数据 // 以部门为单位提报数据
type DepartDutyData struct { type DepartDutyData struct {
OrderId string `json:"orderid"` //订单ID OrderId string `json:"orderid"` //订单ID
Title string `json:"title"` //标题 Title string `json:"title"` //标题
@ -198,7 +198,7 @@ type DepartDutyData struct {
DutyList []DutyListType `json:"dutylist"` //考核细则 DutyList []DutyListType `json:"dutylist"` //考核细则
} }
//考核细则数据 // 考核细则数据
type DutyListType struct { type DutyListType struct {
DutyId string `json:"dutyid"` //职责ID DutyId string `json:"dutyid"` //职责ID
DeductPoints int `json:"deductpoints"` //扣分 DeductPoints int `json:"deductpoints"` //扣分
@ -208,12 +208,12 @@ type DutyListType struct {
ExtraPointsText string `json:"extrapointstext"` //加分说明 ExtraPointsText string `json:"extrapointstext"` //加分说明
} }
//查看提交审批的详细内容 // 查看提交审批的详细内容
type LookDutyCont struct { type LookDutyCont struct {
Id string `json:"id"` Id string `json:"id"`
} }
//查看提交审批的详细内容结果 // 查看提交审批的详细内容结果
type OpenApprovalDataInfo struct { type OpenApprovalDataInfo struct {
Errcode int `json:"errcode"` Errcode int `json:"errcode"`
Errmsg string `json:"errmsg"` Errmsg string `json:"errmsg"`
@ -267,13 +267,13 @@ type NotifyNodeType struct {
ItemUserId string `json:"ItemUserId"` ItemUserId string `json:"ItemUserId"`
} }
//查看本部门提交的和个人提交的审批 // 查看本部门提交的和个人提交的审批
type PersonalOrDepartment struct { type PersonalOrDepartment struct {
assessmentmodel.AssessmentLog assessmentmodel.AssessmentLog
AssdepartTitle string `json:"assdeparttitle"` //被考核部门 AssdepartTitle string `json:"assdeparttitle"` //被考核部门
} }
//查看审批考核详细 // 查看审批考核详细
type LookSeeDutyCont struct { type LookSeeDutyCont struct {
Id string `json:"id"` Id string `json:"id"`
ClassID string `json:"classID"` ClassID string `json:"classID"`
@ -291,7 +291,7 @@ type LookSeeDutyCont struct {
ExtraPointstext string `json:"extraPointstext"` ExtraPointstext string `json:"extraPointstext"`
} }
//扫码登录回传 // 扫码登录回传
type scanCodeStr struct { type scanCodeStr struct {
UserKey string `json:"userkey"` UserKey string `json:"userkey"`
UserToken string `json:"usertoken"` UserToken string `json:"usertoken"`

8
api/index/enter.go

@ -1,10 +1,10 @@
package index package index
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/api/index/assessment" "gin_server_admin/api/index/assessment"
"github.com/flipped-aurora/gin-vue-admin/server/api/index/evaluation" "gin_server_admin/api/index/evaluation"
"github.com/flipped-aurora/gin-vue-admin/server/api/index/examineandapprove" "gin_server_admin/api/index/examineandapprove"
"github.com/flipped-aurora/gin-vue-admin/server/api/index/statistics" "gin_server_admin/api/index/statistics"
) )
type ApiGroup struct { type ApiGroup struct {

16
api/index/evaluation/assessment.go

@ -5,14 +5,14 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//新定性考核列表 // 新定性考核列表
func (e *EvaluationInterface) NewQualitative(c *gin.Context) { func (e *EvaluationInterface) NewQualitative(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -79,7 +79,7 @@ func (e *EvaluationInterface) NewQualitative(c *gin.Context) {
response.Result(0, outContList, "获取成功!", c) response.Result(0, outContList, "获取成功!", c)
} }
//获取定性考核详细指标 // 获取定性考核详细指标
func (e *EvaluationInterface) NewGetQualDetailedTarget(c *gin.Context) { func (e *EvaluationInterface) NewGetQualDetailedTarget(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -169,7 +169,7 @@ func (e *EvaluationInterface) NewGetQualDetailedTarget(c *gin.Context) {
response.Result(0, outContList, "获取成功!", c) response.Result(0, outContList, "获取成功!", c)
} }
//判断全奖与零奖参数 // 判断全奖与零奖参数
func AllZreoConfig(cycles int) (monthInt int64) { func AllZreoConfig(cycles int) (monthInt int64) {
switch cycles { switch cycles {
case 4: case 4:
@ -186,7 +186,7 @@ func AllZreoConfig(cycles int) (monthInt int64) {
return return
} }
//获取定量考核任务列表===>筛出已经提交的数据 // 获取定量考核任务列表===>筛出已经提交的数据
func (e *EvaluationInterface) QualitativeEvalRationNew(c *gin.Context) { func (e *EvaluationInterface) QualitativeEvalRationNew(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {

8
api/index/evaluation/enter.go

@ -3,12 +3,12 @@ package evaluation
import ( import (
"fmt" "fmt"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//数据评估 // 数据评估
type ApiGroup struct { type ApiGroup struct {
EvaluationApi EvaluationInterface EvaluationApi EvaluationInterface
} }

34
api/index/evaluation/evaluation.go

@ -7,22 +7,22 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//个人要执行的考核任务 // 个人要执行的考核任务
func (e *EvaluationInterface) Index(c *gin.Context) { func (e *EvaluationInterface) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "用户端个人要执行的考核任务", c) response.Result(0, outPut, "用户端个人要执行的考核任务", c)
} }
//获取定性考核任务列表 // 获取定性考核任务列表
func (e *EvaluationInterface) QualitativeEvaluation(c *gin.Context) { func (e *EvaluationInterface) QualitativeEvaluation(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -113,7 +113,7 @@ func (e *EvaluationInterface) QualitativeEvaluation(c *gin.Context) {
response.Result(0, uotContAry, "用户端个人要执行的考核任务", c) response.Result(0, uotContAry, "用户端个人要执行的考核任务", c)
} }
//添加扣分或加分选项 // 添加扣分或加分选项
func (e *EvaluationInterface) AdditionAndSubtractionScore(c *gin.Context) { func (e *EvaluationInterface) AdditionAndSubtractionScore(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -322,7 +322,7 @@ func (e *EvaluationInterface) AdditionAndSubtractionScore(c *gin.Context) {
response.Result(0, outData, "数据写入成功", c) response.Result(0, outData, "数据写入成功", c)
} }
//添加责任人 // 添加责任人
func (e *EvaluationInterface) AddDivisionResponsibility(c *gin.Context) { func (e *EvaluationInterface) AddDivisionResponsibility(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -589,7 +589,7 @@ func (e *EvaluationInterface) AddDivisionResponsibility(c *gin.Context) {
response.Result(0, outData, "数据写入成功", c) response.Result(0, outData, "数据写入成功", c)
} }
//添加整改措施 // 添加整改措施
func (e *EvaluationInterface) AddCorrectiveMeasures(c *gin.Context) { func (e *EvaluationInterface) AddCorrectiveMeasures(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -725,7 +725,7 @@ func SendRectifyReceipt(sendUserList, mainTitle, mainTitleDesc, subtitle, reason
return return
} }
//获取定量考核任务列表 // 获取定量考核任务列表
func (e *EvaluationInterface) QualitativeEvalRation(c *gin.Context) { func (e *EvaluationInterface) QualitativeEvalRation(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -960,7 +960,7 @@ func (e *EvaluationInterface) QualitativeEvalRation(c *gin.Context) {
response.Result(0, uotContAry, "用户端个人要执行的考核任务", c) response.Result(0, uotContAry, "用户端个人要执行的考核任务", c)
} }
//添加定量考核项目 // 添加定量考核项目
func (e *EvaluationInterface) AddFlowRationLog(c *gin.Context) { func (e *EvaluationInterface) AddFlowRationLog(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -1250,7 +1250,7 @@ func (e *EvaluationInterface) AddFlowRationLog(c *gin.Context) {
} }
} }
//查看定性考核审批列表 // 查看定性考核审批列表
func (e *EvaluationInterface) LookDutkScoreFlow(c *gin.Context) { func (e *EvaluationInterface) LookDutkScoreFlow(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -1557,7 +1557,7 @@ func (e *EvaluationInterface) LookDutkScoreFlow(c *gin.Context) {
response.Result(0, dutyCecorFlowInfo, "获取成功", c) response.Result(0, dutyCecorFlowInfo, "获取成功", c)
} }
//查看定量考核列表 // 查看定量考核列表
func (d *EvaluationInterface) LookRationkScoreFlow(c *gin.Context) { func (d *EvaluationInterface) LookRationkScoreFlow(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -1802,7 +1802,7 @@ func (d *EvaluationInterface) LookRationkScoreFlow(c *gin.Context) {
response.Result(0, outListMap, "查询成功", c) response.Result(0, outListMap, "查询成功", c)
} }
//获取权重 // 获取权重
func getPlanVersionWeghit(planKey, dimensionId, targetId string) (dimensionIdWeghit, targetIdWeghit int64) { func getPlanVersionWeghit(planKey, dimensionId, targetId string) (dimensionIdWeghit, targetIdWeghit int64) {
var planVersionCont assessmentmodel.PlanVersio var planVersionCont assessmentmodel.PlanVersio
err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.PlanVersio{}).Select("`content`").Where("`key` = ?", planKey).First(&planVersionCont).Error err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.PlanVersio{}).Select("`content`").Where("`key` = ?", planKey).First(&planVersionCont).Error
@ -1827,7 +1827,7 @@ func getPlanVersionWeghit(planKey, dimensionId, targetId string) (dimensionIdWeg
return return
} }
//新查看定量考核列表 // 新查看定量考核列表
func (e *EvaluationInterface) NewLookRationkScoreFlow(c *gin.Context) { func (e *EvaluationInterface) NewLookRationkScoreFlow(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {

12
api/index/evaluation/examineflow.go

@ -3,11 +3,11 @@ package evaluation
import ( import (
"strconv" "strconv"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -171,7 +171,7 @@ func (e *EvaluationInterface) ExamineFlow(c *gin.Context) {
response.Result(0, flowMap, "查询成功!", c) response.Result(0, flowMap, "查询成功!", c)
} }
//获取人员信息 // 获取人员信息
func GetApproveUser(key string) (returnUser commonus.UserListFlowAll) { func GetApproveUser(key string) (returnUser commonus.UserListFlowAll) {
// var userCont hrsystem.Personnel // var userCont hrsystem.Personnel
var userCont hrsystem.PersonArchives var userCont hrsystem.PersonArchives

22
api/index/evaluation/flowsend.go

@ -7,16 +7,16 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//加减分 // 加减分
func (e *EvaluationInterface) PlusOrMinusPoints(c *gin.Context) { func (e *EvaluationInterface) PlusOrMinusPoints(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -324,7 +324,7 @@ func (e *EvaluationInterface) PlusOrMinusPoints(c *gin.Context) {
} }
} }
//添加责任人 // 添加责任人
func (e *EvaluationInterface) PersonInCharge(c *gin.Context) { func (e *EvaluationInterface) PersonInCharge(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -634,7 +634,7 @@ func (e *EvaluationInterface) PersonInCharge(c *gin.Context) {
} }
//判断是否已经存在 // 判断是否已经存在
func judgeIsSet(id int64, idAry []int64) (isTrue bool) { func judgeIsSet(id int64, idAry []int64) (isTrue bool) {
isTrue = false isTrue = false
for _, v := range idAry { for _, v := range idAry {
@ -645,7 +645,7 @@ func judgeIsSet(id int64, idAry []int64) (isTrue bool) {
return return
} }
//填写整改措施 // 填写整改措施
func (e *EvaluationInterface) RectificationMeasures(c *gin.Context) { func (e *EvaluationInterface) RectificationMeasures(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -807,7 +807,7 @@ func (e *EvaluationInterface) RectificationMeasures(c *gin.Context) {
} }
//写入责任节点 // 写入责任节点
func WritePersonLiable(flowKey, userKey []int64) { func WritePersonLiable(flowKey, userKey []int64) {
var userAry []hrsystem.PersonArchives var userAry []hrsystem.PersonArchives
userAryErr := global.GVA_DB_HrDataBase.Model(&hrsystem.PersonArchives{}).Where("`key` IN ?", userKey).Find(&userAry) userAryErr := global.GVA_DB_HrDataBase.Model(&hrsystem.PersonArchives{}).Where("`key` IN ?", userKey).Find(&userAry)

14
api/index/evaluation/flowsendnew.go

@ -7,15 +7,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//加减分 // 加减分
func (e *EvaluationInterface) PlusOrMinusPointsNewYuan(c *gin.Context) { func (e *EvaluationInterface) PlusOrMinusPointsNewYuan(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -323,7 +323,7 @@ func (e *EvaluationInterface) PlusOrMinusPointsNewYuan(c *gin.Context) {
response.Result(0, outMap, "数据写入成功", c) response.Result(0, outMap, "数据写入成功", c)
} }
//加减分 // 加减分
func (e *EvaluationInterface) PlusOrMinusPointsNew(c *gin.Context) { func (e *EvaluationInterface) PlusOrMinusPointsNew(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {

12
api/index/evaluation/lookquantita.go

@ -6,14 +6,14 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//查看定量考核目标设定 // 查看定量考核目标设定
func (e *EvaluationInterface) LookQuantitativeConfig(c *gin.Context) { func (e *EvaluationInterface) LookQuantitativeConfig(c *gin.Context) {
var requestData SelectQuantitativeConfig var requestData SelectQuantitativeConfig
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -114,7 +114,7 @@ func (e *EvaluationInterface) LookQuantitativeConfig(c *gin.Context) {
response.Result(0, outList, "获取成功!", c) response.Result(0, outList, "获取成功!", c)
} }
//查看审批流程 // 查看审批流程
func (e *EvaluationInterface) SeeFlowLogOld(c *gin.Context) { func (e *EvaluationInterface) SeeFlowLogOld(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {

10
api/index/evaluation/sendwechatmsg.go

@ -5,12 +5,12 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//编辑流程步进器 // 编辑流程步进器
func EiteDutiesInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func EiteDutiesInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationProcess{}).Where("`ep_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationProcess{}).Where("`ep_id` = ?", saveId).Updates(saveData).Error
@ -21,7 +21,7 @@ func EiteDutiesInfoes(saveId int64, saveData map[string]interface{}) (isTrue boo
return return
} }
//编辑分数流水 // 编辑分数流水
func EiteScoreFlow(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func EiteScoreFlow(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Where("`sf_key` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Where("`sf_key` = ?", saveId).Updates(saveData).Error

60
api/index/evaluation/type.go

@ -1,13 +1,13 @@
package evaluation package evaluation
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
type EvaluationInterface struct{} type EvaluationInterface struct{}
//考核方案细则列表输出 // 考核方案细则列表输出
type TargetContOutCont struct { type TargetContOutCont struct {
Id string `json:"id"` Id string `json:"id"`
Type int `json:"type"` Type int `json:"type"`
@ -46,20 +46,20 @@ type TargetContOutCont struct {
PlanVersionNumber string `json:"planversionnumber"` //版本号 PlanVersionNumber string `json:"planversionnumber"` //版本号
} }
//定性考核列表输出 // 定性考核列表输出
type QualEvalArrt struct { type QualEvalArrt struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
} }
//附件格式 // 附件格式
type EnclosureFormat struct { type EnclosureFormat struct {
FileName string `json:"filename"` //附件名称 FileName string `json:"filename"` //附件名称
FilePath string `json:"filepath"` //附件地址 FilePath string `json:"filepath"` //附件地址
Type int `json:"type"` //附件类型 Type int `json:"type"` //附件类型
} }
//加减分数据获取项 // 加减分数据获取项
type addPlusOrMinusPoints struct { type addPlusOrMinusPoints struct {
PlanId string `json:"planid"` //方案id PlanId string `json:"planid"` //方案id
Addtime string `json:"time"` //检查时间 Addtime string `json:"time"` //检查时间
@ -80,7 +80,7 @@ type enclosureType struct {
FilePath string `json:"filepath"` //文件路径 FilePath string `json:"filepath"` //文件路径
} }
//划分责任人 // 划分责任人
type DivisionResponsibilityType struct { type DivisionResponsibilityType struct {
Id string `json:"id"` //提交审批流ID Id string `json:"id"` //提交审批流ID
UserList []DivisionResponsibilityUser `json:"userlist"` //责任人 UserList []DivisionResponsibilityUser `json:"userlist"` //责任人
@ -104,7 +104,7 @@ type DivisionResponsibilityUsers struct {
Weight int64 `json:"weight"` //权重 Weight int64 `json:"weight"` //权重
} }
//流程步进 // 流程步进
type FlowStep struct { type FlowStep struct {
Step int `json:"step"` //当前是第几步 Step int `json:"step"` //当前是第几步
Key string `json:"key"` //任务卡ID Key string `json:"key"` //任务卡ID
@ -116,7 +116,7 @@ type FlowStep struct {
NextStep int `json:"nextstep"` //下一步 1:创建;2:创建人部门负责人审批:3:责任划分;4:责任部门审批;5:主要责任人整改;6:责任部门审批;7:验收 NextStep int `json:"nextstep"` //下一步 1:创建;2:创建人部门负责人审批:3:责任划分;4:责任部门审批;5:主要责任人整改;6:责任部门审批;7:验收
} }
//改正措施数据提交 // 改正措施数据提交
type CorrectiveMeasuresType struct { type CorrectiveMeasuresType struct {
OrderId string `json:"orderid"` OrderId string `json:"orderid"`
Content string `json:"content"` //整改内容 Content string `json:"content"` //整改内容
@ -126,7 +126,7 @@ type CorrectiveMeasuresType struct {
Enclosure []commonus.EnclosureFormat `json:"enclosure"` //附件 Enclosure []commonus.EnclosureFormat `json:"enclosure"` //附件
} }
//添加定量考核 // 添加定量考核
type AddRationFlowLog struct { type AddRationFlowLog struct {
GroupId string `json:"groupid"` GroupId string `json:"groupid"`
DepartmentID string `json:"departmentid"` DepartmentID string `json:"departmentid"`
@ -148,7 +148,7 @@ type RationLogList struct {
// PlanVersionNumber string `json:"planversionnumber"` //版本号 // PlanVersionNumber string `json:"planversionnumber"` //版本号
} }
//获取定量考核列表 // 获取定量考核列表
type GetRationFlowLog struct { type GetRationFlowLog struct {
GroupId string `json:"groupid"` GroupId string `json:"groupid"`
DepartmentID string `json:"departmentid"` DepartmentID string `json:"departmentid"`
@ -156,7 +156,7 @@ type GetRationFlowLog struct {
Title string `json:"title"` Title string `json:"title"`
} }
//定性指标流程展示 // 定性指标流程展示
type DutyCecorFlow struct { type DutyCecorFlow struct {
Title string `json:"title"` //审批流标识 Title string `json:"title"` //审批流标识
OrderId string `json:"orderid"` //审批流标识 OrderId string `json:"orderid"` //审批流标识
@ -177,7 +177,7 @@ type DutyCecorFlow struct {
ApprovalRecord []FlowContLog `json:"approvalrecord"` //审批记录 ApprovalRecord []FlowContLog `json:"approvalrecord"` //审批记录
} }
//审批操作 // 审批操作
type FlowContLog struct { type FlowContLog struct {
Name string `json:"name"` Name string `json:"name"`
Icon string `json:"icon"` //头像 Icon string `json:"icon"` //头像
@ -187,7 +187,7 @@ type FlowContLog struct {
TimeVal string `json:"timeval"` //操作时间 TimeVal string `json:"timeval"` //操作时间
} }
//审批流 // 审批流
type TechnologicalProcessType struct { type TechnologicalProcessType struct {
Step int `json:"step"` Step int `json:"step"`
State int `json:"state"` //状态 State int `json:"state"` //状态
@ -207,14 +207,14 @@ type caoZuoRen struct {
TeamName string `json:"teamname"` //班组 TeamName string `json:"teamname"` //班组
} }
//责任划分 // 责任划分
type DivisiosibilityType struct { type DivisiosibilityType struct {
Type string `json:"type"` Type string `json:"type"`
UserName string `json:"username"` UserName string `json:"username"`
Weight int64 `json:"weight"` Weight int64 `json:"weight"`
} }
//整改项目 // 整改项目
type RectifMeasures struct { type RectifMeasures struct {
RecName string `json:"recname"` //整改人 RecName string `json:"recname"` //整改人
RecCont string `json:"reccont"` //整改内容 RecCont string `json:"reccont"` //整改内容
@ -223,7 +223,7 @@ type RectifMeasures struct {
Enclosure []EnclosureFormat `json:"enclosure"` //附件 Enclosure []EnclosureFormat `json:"enclosure"` //附件
} }
//定量考核审批输出 // 定量考核审批输出
type RationOutStruct struct { type RationOutStruct struct {
Id string `json:"id"` Id string `json:"id"`
FlowId string `flowid` FlowId string `flowid`
@ -241,7 +241,7 @@ type RationOutStruct struct {
Weight float64 `json:"weight"` Weight float64 `json:"weight"`
} }
//定量考核目标设定查询 // 定量考核目标设定查询
type SelectQuantitativeConfig struct { type SelectQuantitativeConfig struct {
GroupId string `json:"groupid"` GroupId string `json:"groupid"`
DepartmentID string `json:"departmentid"` DepartmentID string `json:"departmentid"`
@ -254,7 +254,7 @@ type SelectQuantitativeConfig struct {
State int `json:"state"` //状态(1、启用;2、禁用;3、删除) State int `json:"state"` //状态(1、启用;2、禁用;3、删除)
} }
//输出 // 输出
type OutQuantitativeConfig struct { type OutQuantitativeConfig struct {
assessmentmodel.QuantitativeConfig assessmentmodel.QuantitativeConfig
GroupTitle string `json:"grouptitle"` //操作组 GroupTitle string `json:"grouptitle"` //操作组
@ -272,7 +272,7 @@ type MainResponsiblePersonType struct {
Weight int64 `json:"weight"` Weight int64 `json:"weight"`
} }
//流程记录 // 流程记录
type FlowLogType struct { type FlowLogType struct {
commonus.PageSetLimt commonus.PageSetLimt
State int `json:"state"` //状态 State int `json:"state"` //状态
@ -283,7 +283,7 @@ type FlowLogType struct {
Class int `json:"class"` //0:全部;1:定性;2:定量 Class int `json:"class"` //0:全部;1:定性;2:定量
} }
//流程记录输出 // 流程记录输出
type FlowLogListOut struct { type FlowLogListOut struct {
OutId string `json:"outid"` //id OutId string `json:"outid"` //id
Title string `json:"tittle"` //流程名 Title string `json:"tittle"` //流程名
@ -307,14 +307,14 @@ type FlowLogListOut struct {
IsSet int `json:"isset"` //是否已经审批 IsSet int `json:"isset"` //是否已经审批
} }
//新定性考核列表 // 新定性考核列表
type NewQualType struct { type NewQualType struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
Department string `json:"department"` //部门 Department string `json:"department"` //部门
Title string `json:"tittle"` //指标名称 Title string `json:"tittle"` //指标名称
} }
//新型定性考核列表输出 // 新型定性考核列表输出
type NewQualOutList struct { type NewQualOutList struct {
Id int64 `json:"id" gorm:"primaryKey;column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"` Id int64 `json:"id" gorm:"primaryKey;column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"`
Group int64 `json:"group" gorm:"column:qe_group;type:bigint(20) unsigned;default:0;not null;comment:归属集团"` Group int64 `json:"group" gorm:"column:qe_group;type:bigint(20) unsigned;default:0;not null;comment:归属集团"`
@ -329,7 +329,7 @@ type NewQualOutList struct {
ScoreReduction float64 `json:"scorereduction"` //减分总计 ScoreReduction float64 `json:"scorereduction"` //减分总计
} }
//新定性考核指标细则列表 // 新定性考核指标细则列表
type NewQualDetailTar struct { type NewQualDetailTar struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
Department string `json:"department"` //部门 Department string `json:"department"` //部门
@ -337,7 +337,7 @@ type NewQualDetailTar struct {
Title string `json:"title"` Title string `json:"title"`
} }
//新型定性考核细则列表输出 // 新型定性考核细则列表输出
type NewQualDetailOutList struct { type NewQualDetailOutList struct {
NewQualOutList NewQualOutList
Id int64 `json:"id" gorm:"primaryKey;column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"` Id int64 `json:"id" gorm:"primaryKey;column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"`
@ -354,7 +354,7 @@ type NewQualDetailOutList struct {
PlanVersionNumber string `json:"planversionnumber" gorm:"column:qe_qual_eval_id;type:varchar(200) unsigned;default:0;not null;comment:性质考核方案"` //版本号 PlanVersionNumber string `json:"planversionnumber" gorm:"column:qe_qual_eval_id;type:varchar(200) unsigned;default:0;not null;comment:性质考核方案"` //版本号
} }
//定量或者定性考核审批流程全图 // 定量或者定性考核审批流程全图
type getExamineFlow struct { type getExamineFlow struct {
Id string `json:"id"` //考核项目ID Id string `json:"id"` //考核项目ID
IsCorrection int `json:"iscorrection"` //是否整改 IsCorrection int `json:"iscorrection"` //是否整改
@ -369,7 +369,7 @@ type AddDutyNewCont struct {
Child []EvaluPross `json:"child"` //考核细则 Child []EvaluPross `json:"child"` //考核细则
} }
//指标 // 指标
type EvaluPross struct { type EvaluPross struct {
Id string `json:"id"` //维度ID Id string `json:"id"` //维度ID
Name string `json:"name"` Name string `json:"name"`
@ -384,7 +384,7 @@ type EvaluPross struct {
Status int `json:"status"` Status int `json:"status"`
} }
//审批记录输出 // 审批记录输出
type accPerFlowLog struct { type accPerFlowLog struct {
assessmentmodel.EvaluationProcess assessmentmodel.EvaluationProcess
DutyDepartment int64 `json:"dutydepartment" gorm:"column:sf_duty_department;type:bigint(20) unsigned;default:0;not null;comment:职责部门"` DutyDepartment int64 `json:"dutydepartment" gorm:"column:sf_duty_department;type:bigint(20) unsigned;default:0;not null;comment:职责部门"`
@ -399,7 +399,7 @@ type accPerFlowLog struct {
AcceptEvaluation int64 `json:"acceptevaluation" gorm:"column:qe_accept_evaluation;type:bigint(20) unsigned;default:0;not null;comment:接受考核部门"` AcceptEvaluation int64 `json:"acceptevaluation" gorm:"column:qe_accept_evaluation;type:bigint(20) unsigned;default:0;not null;comment:接受考核部门"`
} }
//新定性考核列表 // 新定性考核列表
type QualEvalFlowLog struct { type QualEvalFlowLog struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
Department string `json:"department"` //部门 Department string `json:"department"` //部门
@ -411,7 +411,7 @@ type TongjiFenShu struct {
Count float64 `json:"count" gorm:"column:sf_count;type:int(5) unsigned;default:1;not null;comment:发生次数"` Count float64 `json:"count" gorm:"column:sf_count;type:int(5) unsigned;default:1;not null;comment:发生次数"`
} }
//定量流水全奖值、零奖值、封顶值 // 定量流水全奖值、零奖值、封顶值
type FlowLogAllZreo struct { type FlowLogAllZreo struct {
Id string `json:"id"` Id string `json:"id"`
Zeroprize float64 `json:"zeroprize"` //零奖值"` Zeroprize float64 `json:"zeroprize"` //零奖值"`

12
api/index/examineandapprove/examapp.go

@ -5,20 +5,20 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//考核入口 // 考核入口
func (e *ExamineApproveApi) Index(c *gin.Context) { func (e *ExamineApproveApi) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "用户端审批获取成功", c) response.Result(0, outPut, "用户端审批获取成功", c)
} }
//获取基础配置 // 获取基础配置
func (e *ExamineApproveApi) GetConfing(c *gin.Context) { func (e *ExamineApproveApi) GetConfing(c *gin.Context) {
var requestData ExamConfig var requestData ExamConfig
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

16
api/index/statistics/dataform.go

@ -6,15 +6,15 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/statistics/quantification" "gin_server_admin/api/statistics/quantification"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//获取有效版本考核 // 获取有效版本考核
func (a *ApiGroup) GetPlanVersionValides(c *gin.Context) { func (a *ApiGroup) GetPlanVersionValides(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -597,7 +597,7 @@ func (a *ApiGroup) GetPlanVersionValides(c *gin.Context) {
response.Result(0, outData, "获取成功", c) response.Result(0, outData, "获取成功", c)
} }
//获取总值 定量 // 获取总值 定量
func AuxiliaryCalculationSumMethod(where interface{}, scoringMethod int) (sumScore float64, departmentAry []int64, departNameAry []string) { func AuxiliaryCalculationSumMethod(where interface{}, scoringMethod int) (sumScore float64, departmentAry []int64, departNameAry []string) {
if scoringMethod == 2 { if scoringMethod == 2 {
gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.FlowLogData{}).Joins("left join flow_log as fl on fl.fl_key = flow_log_data.fld_flow_log").Where(where) gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.FlowLogData{}).Joins("left join flow_log as fl on fl.fl_key = flow_log_data.fld_flow_log").Where(where)
@ -621,7 +621,7 @@ func AuxiliaryCalculationSumMethod(where interface{}, scoringMethod int) (sumSco
return return
} }
//定性 // 定性
func SubjectiveAuxiliaryCalculationSumMethod(where interface{}) (sumScore float64, departmentAry []int64, departNameAry []string) { func SubjectiveAuxiliaryCalculationSumMethod(where interface{}) (sumScore float64, departmentAry []int64, departNameAry []string) {
//加分 //加分
var addSumScore float64 = 0 var addSumScore float64 = 0

2
api/index/statistics/enter.go

@ -3,7 +3,7 @@ package statistics
import ( import (
"sync" "sync"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
// 统计 // 统计

10
api/index/statistics/newstatistics.go

@ -6,11 +6,11 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gorm.io/gorm" "gorm.io/gorm"
) )

22
api/index/statistics/programme.go

@ -7,21 +7,21 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/statistics/quantification" "gin_server_admin/api/statistics/quantification"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//考核入口 // 考核入口
func (a *ApiGroup) Index(c *gin.Context) { func (a *ApiGroup) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "方案数据表格获取成功", c) response.Result(0, outPut, "方案数据表格获取成功", c)
} }
//方案数据表格统计 // 方案数据表格统计
func (a *ApiGroup) PlanVersioStatistics(c *gin.Context) { func (a *ApiGroup) PlanVersioStatistics(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -57,7 +57,7 @@ func (a *ApiGroup) PlanVersioStatistics(c *gin.Context) {
response.Result(0, outCont, "获取成功", c) response.Result(0, outCont, "获取成功", c)
} }
//根据部门获取绩效考核数据统计表格 // 根据部门获取绩效考核数据统计表格
func (a *ApiGroup) DepartPerAppDataStatistics(c *gin.Context) { func (a *ApiGroup) DepartPerAppDataStatistics(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -156,7 +156,7 @@ func (a *ApiGroup) DepartPerAppDataStatistics(c *gin.Context) {
response.Result(0, statisticsAry, "查询完成", c) response.Result(0, statisticsAry, "查询完成", c)
} }
//判断集团是否存在 // 判断集团是否存在
func judgeOrgStatic(id string, orgAry []OrgStatics) bool { func judgeOrgStatic(id string, orgAry []OrgStatics) bool {
for _, v := range orgAry { for _, v := range orgAry {
if id == v.Id { if id == v.Id {
@ -166,7 +166,7 @@ func judgeOrgStatic(id string, orgAry []OrgStatics) bool {
return false return false
} }
//判断部门是否存在 // 判断部门是否存在
func judegOrgDeparStatic(id, departId string, orgAry []OrgStatics) bool { func judegOrgDeparStatic(id, departId string, orgAry []OrgStatics) bool {
for _, v := range orgAry { for _, v := range orgAry {
if id == v.Id { if id == v.Id {
@ -180,7 +180,7 @@ func judegOrgDeparStatic(id, departId string, orgAry []OrgStatics) bool {
return false return false
} }
//统计值 // 统计值
func StaticDataOperation(key, group, depart, staticFrame, year string) (staticDataAry []ProgrammeStatisticsCallBack, isTrue bool) { func StaticDataOperation(key, group, depart, staticFrame, year string) (staticDataAry []ProgrammeStatisticsCallBack, isTrue bool) {
isTrue = false isTrue = false
var planInfo []AddDutyNewCont var planInfo []AddDutyNewCont

12
api/index/statistics/queryresults.go

@ -6,12 +6,12 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/statistics/quantification" "gin_server_admin/api/statistics/quantification"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

10
api/index/statistics/tablestatistics.go

@ -7,11 +7,11 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/statistics/quantification" "gin_server_admin/api/statistics/quantification"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

2
api/json_callback/httpserver.go

@ -9,7 +9,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/flipped-aurora/gin-vue-admin/server/wechatjiexi/wxbizjsonmsgcrypt" "gin_server_admin/wechatjiexi/wxbizjsonmsgcrypt"
) )
const token = "gY1AGR3mjBhzy" const token = "gY1AGR3mjBhzy"

2
api/json_callback/sample.go

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/flipped-aurora/gin-vue-admin/server/wechatjiexi/wxbizjsonmsgcrypt" "gin_server_admin/wechatjiexi/wxbizjsonmsgcrypt"
) )
// type MsgContent struct { // type MsgContent struct {

2
api/publichandle/enter.go

@ -1,6 +1,6 @@
package publichandle package publichandle
import "github.com/flipped-aurora/gin-vue-admin/server/api/publichandle/userhandle" import "gin_server_admin/api/publichandle/userhandle"
type ApiGroup struct { type ApiGroup struct {
GeographyApi userhandle.ApiGroup GeographyApi userhandle.ApiGroup

18
api/publichandle/userhandle/handel.go

@ -5,21 +5,21 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/callback" "gin_server_admin/api/wechatapp/callback"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/utils/redishandel" "gin_server_admin/utils/redishandel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//入口 // 入口
func (g *GeographyUnknown) Index(c *gin.Context) { func (g *GeographyUnknown) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "公共API入口获取成功", c) response.Result(0, outPut, "公共API入口获取成功", c)
} }
//获取地理位置上报人员信息 // 获取地理位置上报人员信息
func (g *GeographyUnknown) LocationUserList(c *gin.Context) { func (g *GeographyUnknown) LocationUserList(c *gin.Context) {
var requestData GetLocLocationUserPage var requestData GetLocLocationUserPage
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -48,7 +48,7 @@ func (g *GeographyUnknown) LocationUserList(c *gin.Context) {
response.Result(101, output, "参数错误!请重新提交!", c) response.Result(101, output, "参数错误!请重新提交!", c)
} }
//获取所有地理位置上报人员信息 // 获取所有地理位置上报人员信息
func (g *GeographyUnknown) LocationUserListAll(c *gin.Context) { func (g *GeographyUnknown) LocationUserListAll(c *gin.Context) {
redisPrefix := "Location:GeographicalPosition_" + global.GVA_CONFIG.RedisPrefix.PreFix + ":userId_*" //redis KEY redisPrefix := "Location:GeographicalPosition_" + global.GVA_CONFIG.RedisPrefix.PreFix + ":userId_*" //redis KEY
redisClient := redishandel.RunRedis() redisClient := redishandel.RunRedis()
@ -80,7 +80,7 @@ func (g *GeographyUnknown) LocationUserListAll(c *gin.Context) {
response.Result(0, output, "数据获取成功!", c) response.Result(0, output, "数据获取成功!", c)
} }
//获取人员上报地址点位 // 获取人员上报地址点位
func (g *GeographyUnknown) GetLocationUserAddress(c *gin.Context) { func (g *GeographyUnknown) GetLocationUserAddress(c *gin.Context) {
var requestData GetWechatWorkId var requestData GetWechatWorkId
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

2
api/publichandle/userhandle/type.go

@ -1,6 +1,6 @@
package userhandle package userhandle
import "github.com/flipped-aurora/gin-vue-admin/server/commonus" import "gin_server_admin/commonus"
//地理未知 //地理未知
type GeographyUnknown struct{} type GeographyUnknown struct{}

6
api/reply/enter.go

@ -1,13 +1,13 @@
package reply package reply
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/api/reply/qual" "gin_server_admin/api/reply/qual"
"github.com/flipped-aurora/gin-vue-admin/server/api/reply/quan" "gin_server_admin/api/reply/quan"
) )
//自建审批 //自建审批
//企业微信应用 // 企业微信应用
type ApiGroup struct { type ApiGroup struct {
QuanAipGroup quan.ApiGroup QuanAipGroup quan.ApiGroup
QualApiGroup qual.ApiGroup QualApiGroup qual.ApiGroup

12
api/reply/qual/controller.go

@ -6,15 +6,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//定性审批解析 // 定性审批解析
func (a *ApiGroup) Operation(c *gin.Context) { func (a *ApiGroup) Operation(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {

18
api/reply/qual/divisionrectification.go

@ -7,16 +7,16 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//责任划分 // 责任划分
func (a *ApiGroup) DivisionResponsibility(c *gin.Context) { func (a *ApiGroup) DivisionResponsibility(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -368,7 +368,7 @@ func (a *ApiGroup) DivisionResponsibility(c *gin.Context) {
response.Result(0, outMap, "数据写入成功", c) response.Result(0, outMap, "数据写入成功", c)
} }
//填写整改措施 // 填写整改措施
func (a *ApiGroup) AmendMeasures(c *gin.Context) { func (a *ApiGroup) AmendMeasures(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -550,7 +550,7 @@ func (a *ApiGroup) AmendMeasures(c *gin.Context) {
response.Result(0, outMap, "数据写入成功", c) response.Result(0, outMap, "数据写入成功", c)
} }
//写入责任节点 // 写入责任节点
func WritePersonLiable(flowKey int64, userKey []int64) { func WritePersonLiable(flowKey int64, userKey []int64) {
var userAry []hrsystem.PersonArchives var userAry []hrsystem.PersonArchives
userAryErr := global.GVA_DB_HrDataBase.Model(&hrsystem.PersonArchives{}).Where("`key` IN ?", userKey).Find(&userAry).Error userAryErr := global.GVA_DB_HrDataBase.Model(&hrsystem.PersonArchives{}).Where("`key` IN ?", userKey).Find(&userAry).Error

10
api/reply/qual/enter.go

@ -1,22 +1,22 @@
package qual package qual
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//企业微信回调 // 企业微信回调
type ApiGroup struct { type ApiGroup struct {
} }
//入口 // 入口
func (a *ApiGroup) Index(c *gin.Context) { func (a *ApiGroup) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "定性审批端获取成功", c) response.Result(0, outPut, "定性审批端获取成功", c)
} }
//审批参数 // 审批参数
type ApprovalParameters struct { type ApprovalParameters struct {
OrderId string `json:"orderid"` //流程单KEY OrderId string `json:"orderid"` //流程单KEY
YesOrNo int `json:"yesorno"` //1:同意;2:驳回 YesOrNo int `json:"yesorno"` //1:同意;2:驳回

12
api/reply/quan/controller.go

@ -6,15 +6,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//定量审批 // 定量审批
func (a *ApiGroup) Sanction(c *gin.Context) { func (a *ApiGroup) Sanction(c *gin.Context) {
isTrue, userCont := commonus.ClientIdentity() isTrue, userCont := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {

14
api/reply/quan/enter.go

@ -1,22 +1,22 @@
package quan package quan
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//企业微信回调 // 企业微信回调
type ApiGroup struct { type ApiGroup struct {
} }
//入口 // 入口
func (a *ApiGroup) Index(c *gin.Context) { func (a *ApiGroup) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "定量审批端获取成功", c) response.Result(0, outPut, "定量审批端获取成功", c)
} }
//添加定量考核 // 添加定量考核
type AddRationFlowLog struct { type AddRationFlowLog struct {
GroupId string `json:"groupid"` GroupId string `json:"groupid"`
DepartmentID string `json:"departmentid"` DepartmentID string `json:"departmentid"`
@ -41,7 +41,7 @@ type RationLogList struct {
Cycle int `json:"cycle"` //1:班;2:天;3:周;4:月;5:季度;6:年;7:半年 Cycle int `json:"cycle"` //1:班;2:天;3:周;4:月;5:季度;6:年;7:半年
} }
//审批参数 // 审批参数
type ApprovalParameters struct { type ApprovalParameters struct {
OrderId string `json:"orderid"` //流程单KEY OrderId string `json:"orderid"` //流程单KEY
YesOrNo int `json:"yesorno"` //1:同意;2:驳回 YesOrNo int `json:"yesorno"` //1:同意;2:驳回
@ -61,7 +61,7 @@ type TimeAllDay struct {
ToDay int64 `json:"today"` //天"` ToDay int64 `json:"today"` //天"`
} }
//定量流水全奖值、零奖值、封顶值 // 定量流水全奖值、零奖值、封顶值
type FlowLogAllZreo struct { type FlowLogAllZreo struct {
Id string `json:"id"` Id string `json:"id"`
TargetId string `json:"targetid"` //指标ID` TargetId string `json:"targetid"` //指标ID`

10
api/reply/quan/ration.go

@ -7,11 +7,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage" "gin_server_admin/api/wechatapp/sendmessage"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

4
api/statistics/enter.go

@ -1,8 +1,8 @@
package statistics package statistics
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/api/statistics/nature" "gin_server_admin/api/statistics/nature"
"github.com/flipped-aurora/gin-vue-admin/server/api/statistics/quantification" "gin_server_admin/api/statistics/quantification"
) )
type ApiGroup struct { type ApiGroup struct {

18
api/statistics/nature/statistics.go

@ -5,20 +5,20 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//入口 // 入口
func (a *ApiGroup) Index(c *gin.Context) { func (a *ApiGroup) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "手机考核入口", c) response.Result(0, outPut, "手机考核入口", c)
} }
//计算定性考核组织范围,及起止年份 // 计算定性考核组织范围,及起止年份
func (a *ApiGroup) GetTargetOrgAndYear(c *gin.Context) { func (a *ApiGroup) GetTargetOrgAndYear(c *gin.Context) {
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -144,7 +144,7 @@ func (a *ApiGroup) GetTargetOrgAndYear(c *gin.Context) {
response.Result(0, outMap, "数据获取失败!", c) response.Result(0, outMap, "数据获取失败!", c)
} }
//获取存在的组织架构 // 获取存在的组织架构
func getExistOrg(targetId string) []orgModelsAry { func getExistOrg(targetId string) []orgModelsAry {
var releDepart string var releDepart string
var orgMap []orgModelsAry var orgMap []orgModelsAry
@ -200,7 +200,7 @@ func getExistOrg(targetId string) []orgModelsAry {
return orgMap return orgMap
} }
//定性考核统计 // 定性考核统计
func (a *ApiGroup) NatureStatistics(c *gin.Context) { func (a *ApiGroup) NatureStatistics(c *gin.Context) {
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -222,7 +222,7 @@ func (a *ApiGroup) NatureStatistics(c *gin.Context) {
} }
} }
//计算指标相关数值 // 计算指标相关数值
func calculationEvaluation(taskId string, dataAry natureParameter) (err error) { func calculationEvaluation(taskId string, dataAry natureParameter) (err error) {
var scorFlowList []assessmentmodel.ScoreFlow var scorFlowList []assessmentmodel.ScoreFlow
gormDb := global.GVA_DB_Performanceappraisal.Where("`sf_evaluation_plan` = ?", taskId) gormDb := global.GVA_DB_Performanceappraisal.Where("`sf_evaluation_plan` = ?", taskId)

12
api/statistics/quantification/auxiliarycalculation.go

@ -5,26 +5,26 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//获取总值 // 获取总值
func AuxiliaryCalculationSum(where interface{}) (sumScore float64) { func AuxiliaryCalculationSum(where interface{}) (sumScore float64) {
gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.FlowLogData{}).Joins("left join flow_log as fl on fl.fl_key = flow_log_data.fld_flow_log").Where(where) gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.FlowLogData{}).Joins("left join flow_log as fl on fl.fl_key = flow_log_data.fld_flow_log").Where(where)
gormDb.Pluck("COALESCE(SUM(fld_score), 0) as rescore", &sumScore) gormDb.Pluck("COALESCE(SUM(fld_score), 0) as rescore", &sumScore)
return return
} }
//获取总数 // 获取总数
func AuxiliaryCalculationCount(where interface{}) (sumScore float64) { func AuxiliaryCalculationCount(where interface{}) (sumScore float64) {
gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.FlowLogData{}).Joins("left join flow_log as fl on fl.fl_key = flow_log_data.fld_flow_log").Where(where) gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.FlowLogData{}).Joins("left join flow_log as fl on fl.fl_key = flow_log_data.fld_flow_log").Where(where)
gormDb.Pluck("COALESCE(COUNT(fld_id), 0) as countid", &sumScore) //获取总数 gormDb.Pluck("COALESCE(COUNT(fld_id), 0) as countid", &sumScore) //获取总数
return return
} }
//计算总值和平均值 // 计算总值和平均值
func AverageOfSum(where interface{}, class ...int) (sumScore float64, averageScore float64) { func AverageOfSum(where interface{}, class ...int) (sumScore float64, averageScore float64) {
sumScore = AuxiliaryCalculationSum(where) / 100 sumScore = AuxiliaryCalculationSum(where) / 100
if len(class) > 0 { if len(class) > 0 {

6
api/statistics/quantification/departmentstatisc.go

@ -5,9 +5,9 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//行政维度统计计算 //行政维度统计计算

6
api/statistics/quantification/enter.go

@ -3,9 +3,9 @@ package quantification
import ( import (
"sync" "sync"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

12
api/statistics/quantification/jisuanshuzhi.go

@ -4,9 +4,9 @@ import (
"encoding/json" "encoding/json"
"strconv" "strconv"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//计算数值用的 //计算数值用的
@ -39,14 +39,14 @@ func AuxiliaryCalculationSumNature(where interface{}) (sumScore float64) {
// return sumScore * -1 // return sumScore * -1
} }
//获取定性总数 // 获取定性总数
func AuxiliaryCalculationCountNature(where interface{}) (sumScore float64) { func AuxiliaryCalculationCountNature(where interface{}) (sumScore float64) {
gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Where(where).Where("sf_reply IN (2,3)") gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.ScoreFlow{}).Where(where).Where("sf_reply IN (2,3)")
gormDb.Pluck("COALESCE(COUNT(sf_id), 0) as countid", &sumScore) //获取总数 gormDb.Pluck("COALESCE(COUNT(sf_id), 0) as countid", &sumScore) //获取总数
return return
} }
//计算总值和平均值 // 计算总值和平均值
func AverageOfSumNature(where interface{}, class ...int) (sumScore float64, averageScore float64) { func AverageOfSumNature(where interface{}, class ...int) (sumScore float64, averageScore float64) {
sumScore = AuxiliaryCalculationSumNature(where) / 100 sumScore = AuxiliaryCalculationSumNature(where) / 100
// panic(sumScore) // panic(sumScore)
@ -65,7 +65,7 @@ func AverageOfSumNature(where interface{}, class ...int) (sumScore float64, aver
return return
} }
//统计查询条件 // 统计查询条件
func (d *dataLockStatistics) StatisticalQueryCriteria(qualId int64) { func (d *dataLockStatistics) StatisticalQueryCriteria(qualId int64) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()

16
api/statistics/quantification/quant.go

@ -4,15 +4,15 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//量化考核图标 // 量化考核图标
func (a *ApiGroup) GetQuantEChartOrgAndYear(c *gin.Context) { func (a *ApiGroup) GetQuantEChartOrgAndYear(c *gin.Context) {
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -105,7 +105,7 @@ func bianLiOrg(guoDuOrm, outOrm []orgModels) (ormAry []orgModels) {
return return
} }
//量化考核图标 // 量化考核图标
func (a *ApiGroup) QuantEChart(c *gin.Context) { func (a *ApiGroup) QuantEChart(c *gin.Context) {
isTrue, _ := commonus.ClientIdentity() isTrue, _ := commonus.ClientIdentity()
if isTrue != true { if isTrue != true {
@ -248,7 +248,7 @@ func getGroupOrgList(orgAry []string) (orgMap []orgModelsAry, orgWherList []orgM
return return
} }
//获取行政组织 // 获取行政组织
func getGroupOrg(orgAry []string) (orgMap []orgModelsAry, orgWherList []orgModels) { func getGroupOrg(orgAry []string) (orgMap []orgModelsAry, orgWherList []orgModels) {
var govMap []OutGovCont var govMap []OutGovCont

2
api/statistics/quantification/shiyan.go

@ -3,7 +3,7 @@ package quantification
import ( import (
"fmt" "fmt"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
) )
//维度计算 //维度计算

12
api/statistics/quantification/summary_details.go

@ -6,12 +6,12 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/admin/dutyassess" "gin_server_admin/api/admin/dutyassess"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

8
api/statistics/quantification/timestatistics.go

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//以时间维度查询统计 //以时间维度查询统计
@ -1010,7 +1010,7 @@ func TimeDimensionStatistics(taskId string, dataAry natureParameter) (outputData
return return
} }
//获取指标关联的部门 // 获取指标关联的部门
func GetTargerDepartment(dimension, targerId int64) (departID []string) { func GetTargerDepartment(dimension, targerId int64) (departID []string) {
var taskIdAry []int64 var taskIdAry []int64
global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("qe_state = 1 AND qe_dimension = ? AND qe_target = ?", dimension, targerId).Find(&taskIdAry) global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("qe_state = 1 AND qe_dimension = ? AND qe_target = ?", dimension, targerId).Find(&taskIdAry)

57
api/textcomparison/chinatopinyin.go

@ -0,0 +1,57 @@
package textcomparison
import (
"fmt"
"strings"
"github.com/Chain-Zhang/pinyin"
)
/*
*
@ 作者: 秦东
@ 时间: 2022-09-30 16:00:42
@ 功能: 中文转拼音
@ 参数
#text 中文
@ 返回值
#pinYinStr 拼音
#err 错误信息
*/
func ChinaToPinYinFirstBig(text string) (pinYinStr string, err error) {
pinYinStr, err = pinyin.New(text).Split("").Mode(pinyin.InitialsInCapitals).Convert()
return
}
/*
*
@ 作者: 秦东
@ 时间: 2022-09-30 16:08:40
@ 功能: 获取首字母
@ 参数
#
@ 返回值
#
*/
func ChinaToPinYinFirstWord(text string) (pinYinStr string, err error) {
pinYinStrAll, err := pinyin.New(text).Convert()
pinYinAry := strings.Split(pinYinStrAll, " ")
if len(pinYinAry) < 1 {
err = fmt.Errorf("转译错误!")
return
}
for i := 0; i < len(pinYinAry); i++ {
if len(pinYinAry[i]) > 0 {
ziMuStr := pinYinAry[i][0]
firstWord := strings.ToUpper(string(ziMuStr))
pinYinStr = fmt.Sprintf("%v%v", pinYinStr, firstWord)
}
}
return
}

83
api/textcomparison/goJieba.go

@ -1,83 +0,0 @@
package textcomparison
import (
"sync"
"github.com/yanyiwu/gojieba"
)
type GoJieba struct {
C *gojieba.Jieba
}
var GJB *GoJieba
var one sync.Once
func NewGoJieba() *GoJieba {
one.Do(func() {
GJB = &GoJieba{
C: gojieba.NewJieba(),
//equals with x := NewJieba(DICT_PATH, HMM_PATH, USER_DICT_PATH)
}
})
return GJB
}
func (this *GoJieba) Close() {
this.C.Free()
}
func (this *GoJieba) AddWords(words []string) {
for _, word := range words {
this.C.AddWord(word)
}
}
func (this *GoJieba) JiebaCut(rawStr string, useHmm bool, cutAll bool) (words []string) {
if cutAll {
words = jiebaCutAll(this.C, &rawStr)
} else {
words = jiebaCut(this.C, &rawStr, useHmm)
}
return
}
func (this *GoJieba) JiebaCutWithFrequency(rawStr string, useHmm bool, cutAll bool) (wordsFreqs map[string]int) {
wordsFreqs = make(map[string]int)
if cutAll {
words := jiebaCutAll(this.C, &rawStr)
for _, word := range words {
freq := wordsFreqs[word]
wordsFreqs[word] = freq + 1
}
} else {
words := jiebaCut(this.C, &rawStr, useHmm)
for _, word := range words {
freq := wordsFreqs[word]
wordsFreqs[word] = freq + 1
}
}
return
}
func (this *GoJieba) JiebaCutForSearch(rawStr string, useHmm bool) {
jiebaCut4Search(this.C, &rawStr, useHmm)
}
func jiebaCutAll(x *gojieba.Jieba, rawStr *string) (words []string) {
words = x.CutAll(*rawStr)
return
}
func jiebaCut(x *gojieba.Jieba, rawStr *string, useHmm bool) (words []string) {
words = x.Cut(*rawStr, useHmm)
return
}
func jiebaCut4Search(x *gojieba.Jieba, rawStr *string, useHmm bool) (words []string) {
words = x.CutForSearch(*rawStr, useHmm)
return
}

24
api/v1/archiveapi/archiveapihandle.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/archivesmodel" "gin_server_admin/model/archivesmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -18,7 +18,7 @@ func (a *ArchiveApiHandle) Index(c *gin.Context) {
response.Result(0, outPut, "获取成功", c) response.Result(0, outPut, "获取成功", c)
} }
//栏目列表 // 栏目列表
func (a *ArchiveApiHandle) ArchiveTypeList(c *gin.Context) { func (a *ArchiveApiHandle) ArchiveTypeList(c *gin.Context) {
var requestData archiveTypeListStruct var requestData archiveTypeListStruct
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -74,7 +74,7 @@ func (a *ArchiveApiHandle) ArchiveTypeList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//添加栏目 // 添加栏目
func (a *ArchiveApiHandle) AddArchive(c *gin.Context) { func (a *ArchiveApiHandle) AddArchive(c *gin.Context) {
var arrData appArchiveType var arrData appArchiveType
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -110,7 +110,7 @@ func (a *ArchiveApiHandle) AddArchive(c *gin.Context) {
} }
} }
//获取单个信息栏目 // 获取单个信息栏目
func (a *ArchiveApiHandle) GetArchiveInfo(c *gin.Context) { func (a *ArchiveApiHandle) GetArchiveInfo(c *gin.Context) {
var arrData commonus.SetId var arrData commonus.SetId
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -155,7 +155,7 @@ func (a *ArchiveApiHandle) GetArchiveInfo(c *gin.Context) {
response.Result(0, outPutInfo, "获取成功!", c) response.Result(0, outPutInfo, "获取成功!", c)
} }
//改变栏目状态 // 改变栏目状态
func (a *ArchiveApiHandle) EiteArchiveState(c *gin.Context) { func (a *ArchiveApiHandle) EiteArchiveState(c *gin.Context) {
var arrData archiveState var arrData archiveState
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -206,7 +206,7 @@ func (a *ArchiveApiHandle) EiteArchiveState(c *gin.Context) {
} }
} }
//状态软操作 // 状态软操作
func archiveStateSet(archiveInfo archivesmodel.ArchivesType, arrData archiveState) (isTrue bool, archiveInfoErr error) { func archiveStateSet(archiveInfo archivesmodel.ArchivesType, arrData archiveState) (isTrue bool, archiveInfoErr error) {
isTrue = false isTrue = false
//软处理 //软处理
@ -221,7 +221,7 @@ func archiveStateSet(archiveInfo archivesmodel.ArchivesType, arrData archiveStat
return return
} }
//修改栏目信息 // 修改栏目信息
func (a *ArchiveApiHandle) EiteArchiveInfo(c *gin.Context) { func (a *ArchiveApiHandle) EiteArchiveInfo(c *gin.Context) {
var arrData eiteArchiveCont var arrData eiteArchiveCont
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -261,7 +261,7 @@ func (a *ArchiveApiHandle) EiteArchiveInfo(c *gin.Context) {
response.Result(0, err, "修改成功!", c) response.Result(0, err, "修改成功!", c)
} }
//批量修改栏目 // 批量修改栏目
func (a *ArchiveApiHandle) BatchEiteArchiveState(c *gin.Context) { func (a *ArchiveApiHandle) BatchEiteArchiveState(c *gin.Context) {
var arrData batchArchiveState var arrData batchArchiveState
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -305,7 +305,7 @@ func (a *ArchiveApiHandle) BatchEiteArchiveState(c *gin.Context) {
} }
} }
//批量状态软操作 // 批量状态软操作
func batchArchiveStateSet(archiveInfo archivesmodel.ArchivesType, arrData batchArchiveState) (isTrue bool, archiveInfoErr error) { func batchArchiveStateSet(archiveInfo archivesmodel.ArchivesType, arrData batchArchiveState) (isTrue bool, archiveInfoErr error) {
isTrue = false isTrue = false
//软处理 //软处理

36
api/v1/archiveapi/graphicinformation.go

@ -5,18 +5,18 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/archivesmodel" "gin_server_admin/model/archivesmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//图文信息模块 // 图文信息模块
type GraphicInformation struct{} type GraphicInformation struct{}
//文档列表 // 文档列表
func (g *GraphicInformation) ArchiveFileList(c *gin.Context) { func (g *GraphicInformation) ArchiveFileList(c *gin.Context) {
var requestData fileList var requestData fileList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -143,7 +143,7 @@ func (g *GraphicInformation) ArchiveFileList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获取文档属性 global.GVA_DB_BookDate // 获取文档属性 global.GVA_DB_BookDate
func getBookArrter(id int64) (Reading, Comment, Collect, Likes, Tread, Score int64) { func getBookArrter(id int64) (Reading, Comment, Collect, Likes, Tread, Score int64) {
var bookAttr archivesmodel.BookAttribute var bookAttr archivesmodel.BookAttribute
readingErr := global.GVA_DB_BookDate.Model(&bookAttr).Where("`b_file_id` = ? AND `b_stater` = ? AND `b_type` = ?", id, 1, 1).Count(&Reading).Error readingErr := global.GVA_DB_BookDate.Model(&bookAttr).Where("`b_file_id` = ? AND `b_stater` = ? AND `b_type` = ?", id, 1, 1).Count(&Reading).Error
@ -170,7 +170,7 @@ func getBookArrter(id int64) (Reading, Comment, Collect, Likes, Tread, Score int
return return
} }
//添加文档 // 添加文档
func (g *GraphicInformation) AddArchiveFileInfo(c *gin.Context) { func (g *GraphicInformation) AddArchiveFileInfo(c *gin.Context) {
var archiveFileInfo archivesmodel.ArchiveFile var archiveFileInfo archivesmodel.ArchiveFile
archiveFileInfo.InitInfo() archiveFileInfo.InitInfo()
@ -222,7 +222,7 @@ func (g *GraphicInformation) AddArchiveFileInfo(c *gin.Context) {
} }
} }
//获取文档信息 // 获取文档信息
func (g *GraphicInformation) GetArchiveFileInfo(c *gin.Context) { func (g *GraphicInformation) GetArchiveFileInfo(c *gin.Context) {
var getID commonus.SetId var getID commonus.SetId
err := c.ShouldBindJSON(&getID) err := c.ShouldBindJSON(&getID)
@ -253,7 +253,7 @@ func (g *GraphicInformation) GetArchiveFileInfo(c *gin.Context) {
} }
} }
//修改文档信息 // 修改文档信息
func (g *GraphicInformation) EiteArchiveFileInfo(c *gin.Context) { func (g *GraphicInformation) EiteArchiveFileInfo(c *gin.Context) {
var archiveFileInfo archivesmodel.ArchiveFile var archiveFileInfo archivesmodel.ArchiveFile
err := c.ShouldBindJSON(&archiveFileInfo) err := c.ShouldBindJSON(&archiveFileInfo)
@ -316,7 +316,7 @@ func (g *GraphicInformation) EiteArchiveFileInfo(c *gin.Context) {
response.Result(0, archiveFileInfo, "数据写入成功!", c) response.Result(0, archiveFileInfo, "数据写入成功!", c)
} }
//状态修改及软硬删除文档信息 // 状态修改及软硬删除文档信息
func (g *GraphicInformation) ModifyArchiveFileInfo(c *gin.Context) { func (g *GraphicInformation) ModifyArchiveFileInfo(c *gin.Context) {
var arrData archiveState var arrData archiveState
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -366,7 +366,7 @@ func (g *GraphicInformation) ModifyArchiveFileInfo(c *gin.Context) {
} }
} }
//修改文档状态 // 修改文档状态
func eiteArchiveFileState(arrData archiveState) (isTrue bool) { func eiteArchiveFileState(arrData archiveState) (isTrue bool) {
isTrue = false isTrue = false
//软处理 //软处理
@ -382,7 +382,7 @@ func eiteArchiveFileState(arrData archiveState) (isTrue bool) {
return return
} }
//批量删除 // 批量删除
func (g *GraphicInformation) BatchDeleteArchiveFile(c *gin.Context) { func (g *GraphicInformation) BatchDeleteArchiveFile(c *gin.Context) {
var arrData batchArchiveState var arrData batchArchiveState
err := c.ShouldBindJSON(&arrData) err := c.ShouldBindJSON(&arrData)
@ -424,7 +424,7 @@ func (g *GraphicInformation) BatchDeleteArchiveFile(c *gin.Context) {
} }
} }
//批量修改文档状态 // 批量修改文档状态
func batchEiteArchiveFileState(arrData batchArchiveState) (isTrue bool) { func batchEiteArchiveFileState(arrData batchArchiveState) (isTrue bool) {
isTrue = false isTrue = false
//软处理 //软处理
@ -440,7 +440,7 @@ func batchEiteArchiveFileState(arrData batchArchiveState) (isTrue bool) {
return return
} }
//获取文档属性列表 // 获取文档属性列表
func (g *GraphicInformation) GetArchiveFileAttributeList(c *gin.Context) { func (g *GraphicInformation) GetArchiveFileAttributeList(c *gin.Context) {
var fileAttribute archiveFileAttr var fileAttribute archiveFileAttr
err := c.ShouldBindJSON(&fileAttribute) err := c.ShouldBindJSON(&fileAttribute)
@ -506,7 +506,7 @@ func (g *GraphicInformation) GetArchiveFileAttributeList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//获取人员信息 // 获取人员信息
func GetUserInfo(field []string, whereMap map[string]interface{}) (userCont testpage.PersonalDetails, isTrue bool) { func GetUserInfo(field []string, whereMap map[string]interface{}) (userCont testpage.PersonalDetails, isTrue bool) {
isTrue = false isTrue = false
var userInfo testpage.WorkMan var userInfo testpage.WorkMan
@ -517,7 +517,7 @@ func GetUserInfo(field []string, whereMap map[string]interface{}) (userCont test
return return
} }
//获取归档评论列表 // 获取归档评论列表
func (g *GraphicInformation) GetDiscussFileMsg(c *gin.Context) { func (g *GraphicInformation) GetDiscussFileMsg(c *gin.Context) {
var fileAttribute archiveFileAttr var fileAttribute archiveFileAttr
err := c.ShouldBindJSON(&fileAttribute) err := c.ShouldBindJSON(&fileAttribute)

30
api/v1/archiveapi/requestdata.go

@ -1,19 +1,19 @@
package archiveapi package archiveapi
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/archivesmodel" "gin_server_admin/model/archivesmodel"
) )
//ID //ID
//文档接收列表 // 文档接收列表
type archiveTypeListStruct struct { type archiveTypeListStruct struct {
commonus.PageSetLimt commonus.PageSetLimt
ParentId int64 `json:"parentId"` ParentId int64 `json:"parentId"`
} }
//文档类型输出格式 // 文档类型输出格式
type archiveTypeOutPut struct { type archiveTypeOutPut struct {
commonus.SetId commonus.SetId
ColumnrName string `json:"columnr_name"` //栏目名称 ColumnrName string `json:"columnr_name"` //栏目名称
@ -21,7 +21,7 @@ type archiveTypeOutPut struct {
State bool `json:"state"` // 状态 State bool `json:"state"` // 状态
} }
//添加栏目 // 添加栏目
type appArchiveType struct { type appArchiveType struct {
UID int64 `json:"uid"` //添加人 UID int64 `json:"uid"` //添加人
ParentId int64 `json:"parentId"` //父级 ParentId int64 `json:"parentId"` //父级
@ -29,27 +29,27 @@ type appArchiveType struct {
Sort int `json:"sort"` // 排序 Sort int `json:"sort"` // 排序
} }
//状态修改 // 状态修改
type archiveState struct { type archiveState struct {
commonus.SetId commonus.SetId
State int `json:"state"` // 状态 State int `json:"state"` // 状态
IsDel int `json:"isdel"` // 是否强制删除 IsDel int `json:"isdel"` // 是否强制删除
} }
//批量 // 批量
type batchArchiveState struct { type batchArchiveState struct {
commonus.BatchId commonus.BatchId
State int `json:"state"` // 状态 State int `json:"state"` // 状态
IsDel int `json:"isdel"` // 是否强制删除 IsDel int `json:"isdel"` // 是否强制删除
} }
//修改栏目 // 修改栏目
type eiteArchiveCont struct { type eiteArchiveCont struct {
commonus.SetId commonus.SetId
appArchiveType appArchiveType
} }
//文档列表查询 // 文档列表查询
type fileList struct { type fileList struct {
commonus.PageSetLimt commonus.PageSetLimt
ParentId int64 `json:"parentId"` //父级 ParentId int64 `json:"parentId"` //父级
@ -59,7 +59,7 @@ type fileList struct {
GroupStruct GroupStruct
} }
//组织架构相关 // 组织架构相关
type GroupStruct struct { type GroupStruct struct {
Group int64 `json:"group"` //集团 Group int64 `json:"group"` //集团
Factory int64 `json:"factory"` //分厂 Factory int64 `json:"factory"` //分厂
@ -67,7 +67,7 @@ type GroupStruct struct {
Team int64 `json:"team"` //班组 Team int64 `json:"team"` //班组
} }
//文档列表返回结构 // 文档列表返回结构
type callBackFilesList struct { type callBackFilesList struct {
commonus.SetId commonus.SetId
Title string `json:"title"` //标题 Title string `json:"title"` //标题
@ -85,14 +85,14 @@ type callBackFilesList struct {
State bool `json:"state"` //状态 State bool `json:"state"` //状态
} }
//文档属性列表 // 文档属性列表
type archiveFileAttr struct { type archiveFileAttr struct {
commonus.PageSetLimt commonus.PageSetLimt
FileID int64 `json:"fileID"` FileID int64 `json:"fileID"`
Type int `json:"type"` Type int `json:"type"`
} }
//文档属性列表输出 // 文档属性列表输出
type archiveFileAttrOutPut struct { type archiveFileAttrOutPut struct {
archivesmodel.BookAttribute archivesmodel.BookAttribute
Number string `json:"number"` Number string `json:"number"`
@ -100,7 +100,7 @@ type archiveFileAttrOutPut struct {
OutId string `json:"outID"` OutId string `json:"outID"`
} }
//文档评论属性列表输出 // 文档评论属性列表输出
type archiveFileDiscussAttrOutPut struct { type archiveFileDiscussAttrOutPut struct {
archivesmodel.DiscussMsg archivesmodel.DiscussMsg
Number string `json:"number"` Number string `json:"number"`
@ -108,7 +108,7 @@ type archiveFileDiscussAttrOutPut struct {
UserJsonCont discussJson `json:"userJsonCont"` UserJsonCont discussJson `json:"userJsonCont"`
} }
//评论人员json格式 // 评论人员json格式
type discussJson struct { type discussJson struct {
Numbers string `json:"numbers"` Numbers string `json:"numbers"`
Name string `json:"name"` Name string `json:"name"`

22
api/v1/assessment/assesshandle.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -90,7 +90,7 @@ func (d *DutyHandle) AssEssList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//添加考核项目 // 添加考核项目
func (d *DutyHandle) AddAssEssInfo(c *gin.Context) { func (d *DutyHandle) AddAssEssInfo(c *gin.Context) {
var requestData addAssEssInfo var requestData addAssEssInfo
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -156,7 +156,7 @@ func (d *DutyHandle) AddAssEssInfo(c *gin.Context) {
} }
} }
//获取考核项目详细内容 // 获取考核项目详细内容
func (d *DutyHandle) GetAssEssInfo(c *gin.Context) { func (d *DutyHandle) GetAssEssInfo(c *gin.Context) {
var requestData commonus.SetId var requestData commonus.SetId
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -191,7 +191,7 @@ func (d *DutyHandle) GetAssEssInfo(c *gin.Context) {
} }
//修改考核项目内容 // 修改考核项目内容
func (d *DutyHandle) EiteAssEssInfo(c *gin.Context) { func (d *DutyHandle) EiteAssEssInfo(c *gin.Context) {
var requestData eiteAssEssCont var requestData eiteAssEssCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -264,7 +264,7 @@ func (d *DutyHandle) EiteAssEssInfo(c *gin.Context) {
response.Result(0, saveData, "修改成功!", c) response.Result(0, saveData, "修改成功!", c)
} }
//考核项目编辑操作 // 考核项目编辑操作
func eiteAssEssInfoCont(saveId int64, modelInfo assessmentmodel.AssessMentitems, saveData map[string]interface{}) (isTrue bool, dutyClassInfoErr error) { func eiteAssEssInfoCont(saveId int64, modelInfo assessmentmodel.AssessMentitems, saveData map[string]interface{}) (isTrue bool, dutyClassInfoErr error) {
isTrue = false isTrue = false
dutyClassInfoErr = global.GVA_DB_Performanceappraisal.Model(&modelInfo).Where("ai_id = ?", saveId).Updates(saveData).Error dutyClassInfoErr = global.GVA_DB_Performanceappraisal.Model(&modelInfo).Where("ai_id = ?", saveId).Updates(saveData).Error
@ -275,7 +275,7 @@ func eiteAssEssInfoCont(saveId int64, modelInfo assessmentmodel.AssessMentitems,
return return
} }
//修改考核项目的状态 // 修改考核项目的状态
func (d *DutyHandle) EiteAssEssState(c *gin.Context) { func (d *DutyHandle) EiteAssEssState(c *gin.Context) {
var requestData dutyClassState var requestData dutyClassState
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -326,7 +326,7 @@ func (d *DutyHandle) EiteAssEssState(c *gin.Context) {
} }
} }
//获取职责类别内容 // 获取职责类别内容
func GetAssEssCont(id int64) (isTrue bool, ContInfo assessmentmodel.AssessMentitems) { func GetAssEssCont(id int64) (isTrue bool, ContInfo assessmentmodel.AssessMentitems) {
isTrue = false isTrue = false
err := global.GVA_DB_Performanceappraisal.Where("ai_id = ?", id).First(&ContInfo).Error err := global.GVA_DB_Performanceappraisal.Where("ai_id = ?", id).First(&ContInfo).Error
@ -336,7 +336,7 @@ func GetAssEssCont(id int64) (isTrue bool, ContInfo assessmentmodel.AssessMentit
return return
} }
//获取职责项目及类别 // 获取职责项目及类别
func GetAssessClass(id int64) (istrue bool, sssessClass assessmentmodel.AssessClass) { func GetAssessClass(id int64) (istrue bool, sssessClass assessmentmodel.AssessClass) {
istrue = false istrue = false
assessErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.AssessMentitems{}).Select("assessmentitems.*,dutyclass.*").Joins("left join dutyclass on dutyclass.id = assessmentitems.ai_parent").Where("`ai_id` = ?", id).First(&sssessClass).Error assessErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.AssessMentitems{}).Select("assessmentitems.*,dutyclass.*").Joins("left join dutyclass on dutyclass.id = assessmentitems.ai_parent").Where("`ai_id` = ?", id).First(&sssessClass).Error

39
api/v1/assessment/department_target.go

@ -6,17 +6,17 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//部门考核 // 部门考核
func (d *DutyHandle) DepartmentList(c *gin.Context) { func (d *DutyHandle) DepartmentList(c *gin.Context) {
var requestData rationSelect var requestData rationSelect
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -73,7 +73,7 @@ func (d *DutyHandle) DepartmentListOld(c *gin.Context) {
response.Result(0, departAryList, "数据获取成功!", c) response.Result(0, departAryList, "数据获取成功!", c)
} }
//获取部门考核维度 // 获取部门考核维度
func getDepartDimension(groupId, departId int64) (dimensionAry []departmentDimension) { func getDepartDimension(groupId, departId int64) (dimensionAry []departmentDimension) {
var fileAry []int64 var fileAry []int64
dimErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.DepartmentDimension{}).Select("dd_dimension").Where("`dd_group` = ? AND `dd_department` = ?", groupId, departId).Group("dd_dimension").Find(&fileAry).Error dimErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.DepartmentDimension{}).Select("dd_dimension").Where("`dd_group` = ? AND `dd_department` = ?", groupId, departId).Group("dd_dimension").Find(&fileAry).Error
@ -95,7 +95,7 @@ func getDepartDimension(groupId, departId int64) (dimensionAry []departmentDimen
return return
} }
//部门考核项目 // 部门考核项目
func targetRationDepartList(groupID, departmentID, dimension int64) (contentList []taskDetails) { func targetRationDepartList(groupID, departmentID, dimension int64) (contentList []taskDetails) {
var fileTargetAry []assessmentmodel.QualitativeEvaluation var fileTargetAry []assessmentmodel.QualitativeEvaluation
listTargetErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Where("`qe_group` = ? AND `qe_accept_evaluation` = ? AND `qe_dimension` = ?", groupID, departmentID, dimension).Find(&fileTargetAry).Error listTargetErr := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Where("`qe_group` = ? AND `qe_accept_evaluation` = ? AND `qe_dimension` = ?", groupID, departmentID, dimension).Find(&fileTargetAry).Error
@ -121,7 +121,6 @@ func targetRationDepartList(groupID, departmentID, dimension int64) (contentList
return return
} }
//
func (d *DutyHandle) DepartmentTaskList(c *gin.Context) { func (d *DutyHandle) DepartmentTaskList(c *gin.Context) {
var requestData DelQualitative var requestData DelQualitative
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -246,7 +245,7 @@ func (d *DutyHandle) DepartmentTaskList(c *gin.Context) {
response.Result(0, uotContAry, "数据获取成功!", c) response.Result(0, uotContAry, "数据获取成功!", c)
} }
//获取方案考核细则内容 // 获取方案考核细则内容
func (d *DutyHandle) DetailsAssessmentScheme(c *gin.Context) { func (d *DutyHandle) DetailsAssessmentScheme(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -326,7 +325,7 @@ func (d *DutyHandle) DetailsAssessmentScheme(c *gin.Context) {
response.Result(0, uotCont, "数据获取成功!", c) response.Result(0, uotCont, "数据获取成功!", c)
} }
//删除考核细则方案内容 // 删除考核细则方案内容
func (d *DutyHandle) DelDepartmentTaskList(c *gin.Context) { func (d *DutyHandle) DelDepartmentTaskList(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -371,7 +370,7 @@ func (d *DutyHandle) DelDepartmentTaskList(c *gin.Context) {
} }
} }
//修改考核方案单条考核细则 // 修改考核方案单条考核细则
func (d *DutyHandle) EiteOneQualitativeEvaluation(c *gin.Context) { func (d *DutyHandle) EiteOneQualitativeEvaluation(c *gin.Context) {
var requestData EiteOneQualEval var requestData EiteOneQualEval
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -421,7 +420,7 @@ func (d *DutyHandle) EiteOneQualitativeEvaluation(c *gin.Context) {
} }
} }
//编辑职务数据处理 // 编辑职务数据处理
func eiteOneQuaEvaInfo(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteOneQuaEvaInfo(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Where("`qe_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Where("`qe_id` = ?", saveId).Updates(saveData).Error
@ -432,7 +431,7 @@ func eiteOneQuaEvaInfo(saveId int64, saveData map[string]interface{}) (isTrue bo
return return
} }
//获取定性考核指标对应的结构树 // 获取定性考核指标对应的结构树
func (d *DutyHandle) QualEvalTargetTree(c *gin.Context) { func (d *DutyHandle) QualEvalTargetTree(c *gin.Context) {
var requestData QualEvalTargetTreeDies var requestData QualEvalTargetTreeDies
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -540,7 +539,7 @@ func (d *DutyHandle) QualEvalTargetTree(c *gin.Context) {
response.Result(0, uotContAry, "数据获取成功!", c) response.Result(0, uotContAry, "数据获取成功!", c)
} }
//部门考核(新) // 部门考核(新)
func (d *DutyHandle) DepartmentListNew(c *gin.Context) { func (d *DutyHandle) DepartmentListNew(c *gin.Context) {
var requestData rationSelect var requestData rationSelect
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -569,7 +568,7 @@ func (d *DutyHandle) DepartmentListNew(c *gin.Context) {
response.Result(0, departAryList, "数据获取成功!", c) response.Result(0, departAryList, "数据获取成功!", c)
} }
//获取考核指标 // 获取考核指标
func GetEvalTarget(dimId int64, group, departId string) (dimensionAry []taskDetailsLinkage) { func GetEvalTarget(dimId int64, group, departId string) (dimensionAry []taskDetailsLinkage) {
var contAry []assessmentmodel.EvaluationTarget var contAry []assessmentmodel.EvaluationTarget
gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Where("et_state = 1 AND `et_dimension` = ?", dimId) gormDb := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.EvaluationTarget{}).Where("et_state = 1 AND `et_dimension` = ?", dimId)
@ -615,7 +614,7 @@ func GetEvalTarget(dimId int64, group, departId string) (dimensionAry []taskDeta
return return
} }
//计算该指定部门维度指标下的分值 // 计算该指定部门维度指标下的分值
func GetDepartDimTargetScore(group, depert string, dimeid, targetid int64) (scoreAll int64) { func GetDepartDimTargetScore(group, depert string, dimeid, targetid int64) (scoreAll int64) {
err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Where("`qe_group` = ? AND `qe_accept_evaluation` = ? AND `qe_dimension` = ? AND `qe_target` = ? AND qe_state = 1", group, depert, dimeid, targetid).Pluck("COALESCE(SUM(qe_reference_score), 0) as rescore", &scoreAll).Error err := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Where("`qe_group` = ? AND `qe_accept_evaluation` = ? AND `qe_dimension` = ? AND `qe_target` = ? AND qe_state = 1", group, depert, dimeid, targetid).Pluck("COALESCE(SUM(qe_reference_score), 0) as rescore", &scoreAll).Error
@ -625,7 +624,7 @@ func GetDepartDimTargetScore(group, depert string, dimeid, targetid int64) (scor
return return
} }
//部门添加考核方案NEw // 部门添加考核方案NEw
func (d *DutyHandle) AddDepartmentDutyInfo(c *gin.Context) { func (d *DutyHandle) AddDepartmentDutyInfo(c *gin.Context) {
var requestData AddDutyNewContGroup var requestData AddDutyNewContGroup
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

20
api/v1/assessment/detailed_target.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -15,7 +15,7 @@ import (
考核细则 考核细则
*/ */
//添加定性指标子栏目 // 添加定性指标子栏目
func (d *DutyHandle) AddDetailedTarget(c *gin.Context) { func (d *DutyHandle) AddDetailedTarget(c *gin.Context) {
var requestData addDetailedTargetType var requestData addDetailedTargetType
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -69,7 +69,7 @@ func (d *DutyHandle) AddDetailedTarget(c *gin.Context) {
} }
} }
//获取考核细则详细内容 // 获取考核细则详细内容
func (d *DutyHandle) GetDetailedTarget(c *gin.Context) { func (d *DutyHandle) GetDetailedTarget(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -108,7 +108,7 @@ func (d *DutyHandle) GetDetailedTarget(c *gin.Context) {
response.Result(0, systemEvalCont, "数据获取成功!", c) response.Result(0, systemEvalCont, "数据获取成功!", c)
} }
//获取考核细则详细内容 // 获取考核细则详细内容
func (d *DutyHandle) GetDetailedTargetList(c *gin.Context) { func (d *DutyHandle) GetDetailedTargetList(c *gin.Context) {
var requestData detailedTargetTypeList var requestData detailedTargetTypeList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -170,7 +170,7 @@ func (d *DutyHandle) GetDetailedTargetList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//编辑考核细则数据处理 // 编辑考核细则数据处理
func eiteDetailedTargetInfo(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteDetailedTargetInfo(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.DetailedTarget{}).Where("`dt_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.DetailedTarget{}).Where("`dt_id` = ?", saveId).Updates(saveData).Error
@ -181,7 +181,7 @@ func eiteDetailedTargetInfo(saveId int64, saveData map[string]interface{}) (isTr
return return
} }
//编辑考核细则内容 // 编辑考核细则内容
func (d *DutyHandle) EiteDetailedTargetCont(c *gin.Context) { func (d *DutyHandle) EiteDetailedTargetCont(c *gin.Context) {
var requestData eitedetailedTargetCon var requestData eitedetailedTargetCon
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -259,7 +259,7 @@ func (d *DutyHandle) EiteDetailedTargetCont(c *gin.Context) {
} }
} }
//删除考核细则 // 删除考核细则
func (d *DutyHandle) DelDetailedTargetCont(c *gin.Context) { func (d *DutyHandle) DelDetailedTargetCont(c *gin.Context) {
var requestData dutyClassState var requestData dutyClassState
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

26
api/v1/assessment/dutyhandle.go

@ -4,20 +4,20 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//入口 // 入口
func (d *DutyHandle) Index(c *gin.Context) { func (d *DutyHandle) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "获取成功", c) response.Result(0, outPut, "获取成功", c)
} }
//职责类别列表 // 职责类别列表
func (d *DutyHandle) DutyClassList(c *gin.Context) { func (d *DutyHandle) DutyClassList(c *gin.Context) {
var requestData dutyClassRequest var requestData dutyClassRequest
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -82,7 +82,7 @@ func (d *DutyHandle) DutyClassList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//判断是否已经被使用 // 判断是否已经被使用
func judgeIsTrue(classId int64) (isTrue int) { func judgeIsTrue(classId int64) (isTrue int) {
isTrue = 2 isTrue = 2
var evalTarCont []assessmentmodel.EvaluationTarget var evalTarCont []assessmentmodel.EvaluationTarget
@ -95,7 +95,7 @@ func judgeIsTrue(classId int64) (isTrue int) {
return return
} }
//添加职责类别 // 添加职责类别
func (d *DutyHandle) AddDutyClass(c *gin.Context) { func (d *DutyHandle) AddDutyClass(c *gin.Context) {
var requestData dutyClassAdd var requestData dutyClassAdd
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -136,7 +136,7 @@ func (d *DutyHandle) AddDutyClass(c *gin.Context) {
} }
} }
//查看职责类别详情 // 查看职责类别详情
func (d *DutyHandle) GetDutyClassInfo(c *gin.Context) { func (d *DutyHandle) GetDutyClassInfo(c *gin.Context) {
var requestData commonus.SetId var requestData commonus.SetId
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -163,7 +163,7 @@ func (d *DutyHandle) GetDutyClassInfo(c *gin.Context) {
response.Result(0, dutyClassCont, "数据查询成功!", c) response.Result(0, dutyClassCont, "数据查询成功!", c)
} }
//修改职责类别内容 // 修改职责类别内容
func (d *DutyHandle) EiteDutyClassInfo(c *gin.Context) { func (d *DutyHandle) EiteDutyClassInfo(c *gin.Context) {
var requestData dutyClassEite var requestData dutyClassEite
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -217,7 +217,7 @@ func (d *DutyHandle) EiteDutyClassInfo(c *gin.Context) {
response.Result(0, eiteDutyClass, "数据编辑成功!", c) response.Result(0, eiteDutyClass, "数据编辑成功!", c)
} }
//状态变更及删除 // 状态变更及删除
func (d *DutyHandle) StateDutyClass(c *gin.Context) { func (d *DutyHandle) StateDutyClass(c *gin.Context) {
var requestData dutyClassState var requestData dutyClassState
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -265,7 +265,7 @@ func (d *DutyHandle) StateDutyClass(c *gin.Context) {
} }
} }
//状态软操作 // 状态软操作
func dutyInfoStateSet(dutyClassInfo assessmentmodel.DutyClass, arrData dutyClassState) (isTrue bool, dutyClassInfoErr error) { func dutyInfoStateSet(dutyClassInfo assessmentmodel.DutyClass, arrData dutyClassState) (isTrue bool, dutyClassInfoErr error) {
isTrue = false isTrue = false
//软处理 //软处理
@ -280,7 +280,7 @@ func dutyInfoStateSet(dutyClassInfo assessmentmodel.DutyClass, arrData dutyClass
return return
} }
//获取职责类别内容 // 获取职责类别内容
func GetDutyClassCont(id int64) (isTrue bool, ContInfo assessmentmodel.DutyClass) { func GetDutyClassCont(id int64) (isTrue bool, ContInfo assessmentmodel.DutyClass) {
isTrue = false isTrue = false
err := global.GVA_DB_Performanceappraisal.Where("id = ?", id).First(&ContInfo).Error err := global.GVA_DB_Performanceappraisal.Where("id = ?", id).First(&ContInfo).Error

26
api/v1/assessment/dutylist.go

@ -4,15 +4,15 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//具体职责 // 具体职责
func (d *DutyHandle) DutyList(c *gin.Context) { func (d *DutyHandle) DutyList(c *gin.Context) {
var requestData dutyRequest var requestData dutyRequest
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -113,7 +113,7 @@ func (d *DutyHandle) DutyList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//添加考核细则 // 添加考核细则
func (d *DutyHandle) AddDutyInfo(c *gin.Context) { func (d *DutyHandle) AddDutyInfo(c *gin.Context) {
var requestData addDutyContent var requestData addDutyContent
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -191,7 +191,7 @@ func (d *DutyHandle) AddDutyInfo(c *gin.Context) {
} }
} }
//获取具体职责 // 获取具体职责
func (d *DutyHandle) GetDutyInfo(c *gin.Context) { func (d *DutyHandle) GetDutyInfo(c *gin.Context) {
var requestData commonus.SetId var requestData commonus.SetId
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -247,7 +247,7 @@ func (d *DutyHandle) GetDutyInfo(c *gin.Context) {
response.Result(0, dutyOutInfo, "数据查询成功!", c) response.Result(0, dutyOutInfo, "数据查询成功!", c)
} }
//编辑具体职责 // 编辑具体职责
func (d *DutyHandle) EiteDutyInfor(c *gin.Context) { func (d *DutyHandle) EiteDutyInfor(c *gin.Context) {
var requestData eiteDutyCont var requestData eiteDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -322,7 +322,7 @@ func (d *DutyHandle) EiteDutyInfor(c *gin.Context) {
response.Result(0, saveData, "修改成功!", c) response.Result(0, saveData, "修改成功!", c)
} }
//编辑具体职责内容 // 编辑具体职责内容
func eiteDutyInfoCont(saveId int64, modelInfo assessmentmodel.DutyContent, saveData map[string]interface{}) (isTrue bool, dutyClassInfoErr error) { func eiteDutyInfoCont(saveId int64, modelInfo assessmentmodel.DutyContent, saveData map[string]interface{}) (isTrue bool, dutyClassInfoErr error) {
isTrue = false isTrue = false
dutyClassInfoErr = global.GVA_DB_Performanceappraisal.Model(&modelInfo).Where("dc_id = ?", saveId).Updates(saveData).Error dutyClassInfoErr = global.GVA_DB_Performanceappraisal.Model(&modelInfo).Where("dc_id = ?", saveId).Updates(saveData).Error
@ -333,7 +333,7 @@ func eiteDutyInfoCont(saveId int64, modelInfo assessmentmodel.DutyContent, saveD
return return
} }
//修改考核项目的状态 // 修改考核项目的状态
func (d *DutyHandle) EiteDutyState(c *gin.Context) { func (d *DutyHandle) EiteDutyState(c *gin.Context) {
var requestData dutyClassState var requestData dutyClassState
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -384,7 +384,7 @@ func (d *DutyHandle) EiteDutyState(c *gin.Context) {
} }
} }
//获取职责类别内容 // 获取职责类别内容
func GetDutyInfoCont(id int64) (isTrue bool, ContInfo assessmentmodel.DutyContent) { func GetDutyInfoCont(id int64) (isTrue bool, ContInfo assessmentmodel.DutyContent) {
isTrue = false isTrue = false
err := global.GVA_DB_Performanceappraisal.Where("dc_id = ?", id).First(&ContInfo).Error err := global.GVA_DB_Performanceappraisal.Where("dc_id = ?", id).First(&ContInfo).Error
@ -394,7 +394,7 @@ func GetDutyInfoCont(id int64) (isTrue bool, ContInfo assessmentmodel.DutyConten
return return
} }
//获取职责类别内容 // 获取职责类别内容
func GetDutyInfoContAll(id int64) (isTrue bool, outAssDutyInfo outAessDuty) { func GetDutyInfoContAll(id int64) (isTrue bool, outAssDutyInfo outAessDuty) {
isTrue = false isTrue = false
var ContInfo dutyAssClass var ContInfo dutyAssClass

152
api/v1/assessment/dutytype.go

@ -3,36 +3,36 @@ package assessment
import ( import (
"sync" "sync"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//协程设置 // 协程设置
var syncProcess = sync.WaitGroup{} var syncProcess = sync.WaitGroup{}
//数据锁统计 // 数据锁统计
type dataLockStatistics struct { type dataLockStatistics struct {
dataMap []map[string]interface{} dataMap []map[string]interface{}
dataErrMap []map[string]interface{} dataErrMap []map[string]interface{}
mutext sync.RWMutex mutext sync.RWMutex
} }
//读取锁数据 // 读取锁数据
func (d *dataLockStatistics) readMyDayData() ([]map[string]interface{}, []map[string]interface{}) { func (d *dataLockStatistics) readMyDayData() ([]map[string]interface{}, []map[string]interface{}) {
d.mutext.RLock() d.mutext.RLock()
defer d.mutext.RUnlock() defer d.mutext.RUnlock()
return d.dataMap, d.dataErrMap return d.dataMap, d.dataErrMap
} }
//职责考核 // 职责考核
type DutyHandle struct{} type DutyHandle struct{}
//字符串ID // 字符串ID
type OutIdStruct struct { type OutIdStruct struct {
OutId string `json:"outId"` OutId string `json:"outId"`
} }
//职责类别查询参数 // 职责类别查询参数
type dutyClassRequest struct { type dutyClassRequest struct {
commonus.PageSetLimt commonus.PageSetLimt
OutIdStruct OutIdStruct
@ -40,34 +40,34 @@ type dutyClassRequest struct {
State int `json:"state"` State int `json:"state"`
} }
//职责类别输出 // 职责类别输出
type dutyClassOutput struct { type dutyClassOutput struct {
assessmentmodel.DutyClass assessmentmodel.DutyClass
OutIdStruct OutIdStruct
IsTrue int `json:"istrue"` IsTrue int `json:"istrue"`
} }
//职责类别添加 // 职责类别添加
type dutyClassAdd struct { type dutyClassAdd struct {
Title string `json:"title"` Title string `json:"title"`
Type int `json:"type"` //1:定性考核;2:定量考核 Type int `json:"type"` //1:定性考核;2:定量考核
Sort int `json:"sort"` Sort int `json:"sort"`
} }
//职责类别修改 // 职责类别修改
type dutyClassEite struct { type dutyClassEite struct {
commonus.SetId commonus.SetId
dutyClassAdd dutyClassAdd
} }
//状态修改 // 状态修改
type dutyClassState struct { type dutyClassState struct {
commonus.SetId commonus.SetId
State int `json:"state"` // 状态 State int `json:"state"` // 状态
IsDel int `json:"isdel"` // 是否强制删除 IsDel int `json:"isdel"` // 是否强制删除
} }
//考核项目查询参数 // 考核项目查询参数
type assessRequest struct { type assessRequest struct {
commonus.PageSetLimt commonus.PageSetLimt
ParentId string `json:"parentId"` //父级 ParentId string `json:"parentId"` //父级
@ -75,7 +75,7 @@ type assessRequest struct {
State int `json:"state"` State int `json:"state"`
} }
//考核项目输出 // 考核项目输出
type assessOutput struct { type assessOutput struct {
assessmentmodel.AssessMentitems assessmentmodel.AssessMentitems
OutIdStruct OutIdStruct
@ -83,7 +83,7 @@ type assessOutput struct {
ParentTitle string `json:"parentTitle"` ParentTitle string `json:"parentTitle"`
} }
//添加考核项目内容 // 添加考核项目内容
type addAssEssInfo struct { type addAssEssInfo struct {
dutyClassAdd dutyClassAdd
Content string `json:"content"` //描述 Content string `json:"content"` //描述
@ -94,7 +94,7 @@ type addAssEssInfo struct {
CycleAttr int `json:"cycleattr"` //辅助计数 CycleAttr int `json:"cycleattr"` //辅助计数
} }
//修改考核项目内容 // 修改考核项目内容
type eiteAssEssCont struct { type eiteAssEssCont struct {
commonus.SetId commonus.SetId
dutyClassAdd dutyClassAdd
@ -106,7 +106,7 @@ type eiteAssEssCont struct {
CycleAttr int `json:"cycleattr"` //辅助计数 CycleAttr int `json:"cycleattr"` //辅助计数
} }
//具体职责查询 // 具体职责查询
type dutyRequest struct { type dutyRequest struct {
commonus.PageSetLimt commonus.PageSetLimt
ParentId string `json:"parentId"` //父级 ParentId string `json:"parentId"` //父级
@ -116,7 +116,7 @@ type dutyRequest struct {
AssEssUserId string `json:"assessuserid"` AssEssUserId string `json:"assessuserid"`
} }
//具体职责输出 // 具体职责输出
type dutyOutput struct { type dutyOutput struct {
assessmentmodel.DutyContent assessmentmodel.DutyContent
OutIdStruct OutIdStruct
@ -133,7 +133,7 @@ type dutyOutput struct {
Content string `json:"contenting"` //描述 Content string `json:"contenting"` //描述
} }
//添加具体职责 // 添加具体职责
type addDutyContent struct { type addDutyContent struct {
dutyClassAdd dutyClassAdd
Type int `json:"type"` //1:定量考核;2:定性考核 Type int `json:"type"` //1:定量考核;2:定性考核
@ -146,7 +146,7 @@ type addDutyContent struct {
Content string `json:"content"` //描述 Content string `json:"content"` //描述
} }
//编辑具体项目 // 编辑具体项目
type eiteDutyCont struct { type eiteDutyCont struct {
commonus.SetId commonus.SetId
dutyClassAdd dutyClassAdd
@ -160,13 +160,13 @@ type eiteDutyCont struct {
Content string `json:"content"` //描述 Content string `json:"content"` //描述
} }
//部门具体职责 // 部门具体职责
type specificDutyRequest struct { type specificDutyRequest struct {
commonus.PageSetLimt commonus.PageSetLimt
DepartmentId string `json:"departmentId"` //部门ID DepartmentId string `json:"departmentId"` //部门ID
} }
//部门具体职责输出 // 部门具体职责输出
type specificDutyOut struct { type specificDutyOut struct {
assessmentmodel.DepartDuty assessmentmodel.DepartDuty
OutIdStruct OutIdStruct
@ -185,7 +185,7 @@ type specificDutyOut struct {
GroupTitle string `json:"groupTitle"` //集团 GroupTitle string `json:"groupTitle"` //集团
} }
//添加部门具体职责 // 添加部门具体职责
type addSpecificDutyCont struct { type addSpecificDutyCont struct {
ParentId string `json:"parentId"` //部门ID ParentId string `json:"parentId"` //部门ID
ClassId string `json:"classId"` //考核类别 ClassId string `json:"classId"` //考核类别
@ -201,7 +201,7 @@ type addDepartDutyCont struct {
Score int64 `json:"score"` //分数 Score int64 `json:"score"` //分数
} }
//编辑部门具体职责 // 编辑部门具体职责
type eiteSpecificDutyCont struct { type eiteSpecificDutyCont struct {
commonus.SetId commonus.SetId
ParentId string `json:"parentId"` //部门ID ParentId string `json:"parentId"` //部门ID
@ -219,7 +219,7 @@ type eiteDepartDutyCont struct {
Score int64 `json:"score"` //分数 Score int64 `json:"score"` //分数
} }
//输出考核关系架构 // 输出考核关系架构
type outAessDuty struct { type outAessDuty struct {
ClassId int64 `json:"classId"` ClassId int64 `json:"classId"`
ClassTitle string `json:"classTitle"` ClassTitle string `json:"classTitle"`
@ -228,7 +228,7 @@ type outAessDuty struct {
DutyTitle string `json:"dutyTitle"` DutyTitle string `json:"dutyTitle"`
} }
//具体职责项与考核项目,类别 // 具体职责项与考核项目,类别
type dutyAssClass struct { type dutyAssClass struct {
Title string `json:"title" gorm:"column:dc_title;type:text;comment:具体职责"` Title string `json:"title" gorm:"column:dc_title;type:text;comment:具体职责"`
PartId int64 `json:"partId" gorm:"column:dc_parent;type:bigint(20) unsigned;default:0;not null;comment:父级"` PartId int64 `json:"partId" gorm:"column:dc_parent;type:bigint(20) unsigned;default:0;not null;comment:父级"`
@ -242,7 +242,7 @@ type dutyAssClass struct {
*/ */
type EvaluationScheme struct{} type EvaluationScheme struct{}
//添加考核方案 // 添加考核方案
type AddScheme struct { type AddScheme struct {
dutyClassAdd //标题 dutyClassAdd //标题
Group int64 `json:"group"` //集团 Group int64 `json:"group"` //集团
@ -282,7 +282,7 @@ type listTarget struct {
Dimension string `json:"dimension"` //维度 (待定是否使用) Dimension string `json:"dimension"` //维度 (待定是否使用)
} }
//添加指标 // 添加指标
type addTargetType struct { type addTargetType struct {
Title string `json:"title"` Title string `json:"title"`
Type int `json:"type"` //1:定性考核;2:定量考核 Type int `json:"type"` //1:定性考核;2:定量考核
@ -298,7 +298,7 @@ type addTargetType struct {
ScoringMethod int `json:"scoringmethod"` //计分方式(1:自动;2:手动) ScoringMethod int `json:"scoringmethod"` //计分方式(1:自动;2:手动)
} }
//列表输出 // 列表输出
type outTargetList struct { type outTargetList struct {
assessmentmodel.EvaluationTarget assessmentmodel.EvaluationTarget
OutId string `json:"outid"` OutId string `json:"outid"`
@ -309,13 +309,13 @@ type outTargetList struct {
VisibleRangeDepartMap []outTargetAttr `json:"visiblerangedepartmap"` //可见范围(分厂) VisibleRangeDepartMap []outTargetAttr `json:"visiblerangedepartmap"` //可见范围(分厂)
} }
//输出结构体 // 输出结构体
type outTargetAttr struct { type outTargetAttr struct {
Key string `json:"key"` Key string `json:"key"`
Title string `json:"title"` Title string `json:"title"`
} }
//详细内容输出 // 详细内容输出
type outTargetInfo struct { type outTargetInfo struct {
assessmentmodel.EvaluationTarget assessmentmodel.EvaluationTarget
GroupMap []string `json:"group"` GroupMap []string `json:"group"`
@ -326,7 +326,7 @@ type outTargetInfo struct {
VisibleRangeDepartMap []string `json:"visiblerangedepartmap"` //可见范围(分厂) VisibleRangeDepartMap []string `json:"visiblerangedepartmap"` //可见范围(分厂)
} }
//指标内容修改 // 指标内容修改
type eiteTargetTypeCont struct { type eiteTargetTypeCont struct {
commonus.SetId commonus.SetId
addTargetType addTargetType
@ -340,14 +340,14 @@ type addAttTarget struct {
ParentId string `json:"parentid"` ParentId string `json:"parentid"`
} }
//子栏目列表 // 子栏目列表
type attTargetList struct { type attTargetList struct {
commonus.PageSetLimt commonus.PageSetLimt
addAttTarget addAttTarget
State int `json:"state"` //状态(1:启用;2:禁用;3:删除) State int `json:"state"` //状态(1:启用;2:禁用;3:删除)
} }
//子栏目列表输出 // 子栏目列表输出
type attTargetListOut struct { type attTargetListOut struct {
assessmentmodel.QualitativeTarget assessmentmodel.QualitativeTarget
ParentIdStr string `json:"parentidstr"` ParentIdStr string `json:"parentidstr"`
@ -355,7 +355,7 @@ type attTargetListOut struct {
OutId string `json:"outid"` OutId string `json:"outid"`
} }
//指标子栏目修改 // 指标子栏目修改
type eiteAttTarget struct { type eiteAttTarget struct {
commonus.SetId commonus.SetId
addAttTarget addAttTarget
@ -371,7 +371,7 @@ type addDetailedTargetType struct {
ParentIdSun string `json:"parentidsun"` ParentIdSun string `json:"parentidsun"`
} }
//考核细则输出 // 考核细则输出
type outDetailedTargetType struct { type outDetailedTargetType struct {
assessmentmodel.DetailedTarget assessmentmodel.DetailedTarget
ParentIdStr string `json:"parentidstr"` ParentIdStr string `json:"parentidstr"`
@ -381,14 +381,14 @@ type outDetailedTargetType struct {
OutId string `json:"outid"` OutId string `json:"outid"`
} }
//考核细则列表 // 考核细则列表
type detailedTargetTypeList struct { type detailedTargetTypeList struct {
commonus.PageSetLimt commonus.PageSetLimt
addDetailedTargetType addDetailedTargetType
State int `json:"state"` //状态(1:启用;2:禁用;3:删除) State int `json:"state"` //状态(1:启用;2:禁用;3:删除)
} }
//修改考核细则 // 修改考核细则
type eitedetailedTargetCon struct { type eitedetailedTargetCon struct {
commonus.SetId commonus.SetId
addDetailedTargetType addDetailedTargetType
@ -408,7 +408,7 @@ type AddQualEval struct {
EvaluationList []QualEvalSunList `json:"evaluationlist"` //测评详情 EvaluationList []QualEvalSunList `json:"evaluationlist"` //测评详情
} }
//定性考核内容 // 定性考核内容
type QualEvalSunList struct { type QualEvalSunList struct {
DetailedTarget string `json:"id"` //考核细则 DetailedTarget string `json:"id"` //考核细则
Title string `json:"title"` //指标说明 Title string `json:"title"` //指标说明
@ -421,13 +421,13 @@ type QualEvalSunList struct {
Operator []string `json:"userlist"` //考核执行人 Operator []string `json:"userlist"` //考核执行人
} }
//查询定性考核列表 // 查询定性考核列表
type SelectQualEval struct { type SelectQualEval struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DepartmentId string `json:"parentid"` //接受考核部门 DepartmentId string `json:"parentid"` //接受考核部门
} }
//定性考核列表输出 // 定性考核列表输出
type QualEvalArrt struct { type QualEvalArrt struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
@ -437,31 +437,31 @@ type QualEvalListOut struct {
Child []QualEvalListOutDepart `json:"child"` //定性考核部门 Child []QualEvalListOutDepart `json:"child"` //定性考核部门
} }
//定性考核部门 // 定性考核部门
type QualEvalListOutDepart struct { type QualEvalListOutDepart struct {
QualEvalArrt QualEvalArrt
Child []DimensionList `json:"child"` //维度列表 Child []DimensionList `json:"child"` //维度列表
} }
//定性考核列表维度项目 // 定性考核列表维度项目
type DimensionList struct { type DimensionList struct {
QualEvalArrt QualEvalArrt
Child []TargetList `json:"child"` //定性指标 Child []TargetList `json:"child"` //定性指标
} }
//定性指标 // 定性指标
type TargetList struct { type TargetList struct {
QualEvalArrt QualEvalArrt
Child []TargetSunList `json:"child"` //定性指标子栏目 Child []TargetSunList `json:"child"` //定性指标子栏目
} }
//定性指标子栏目 // 定性指标子栏目
type TargetSunList struct { type TargetSunList struct {
QualEvalArrt QualEvalArrt
Child []taskDetails `json:"child"` //考核细则 Child []taskDetails `json:"child"` //考核细则
} }
//具体职责 // 具体职责
type taskDetails struct { type taskDetails struct {
QualEvalArrt QualEvalArrt
Content string `json:"content"` //指标说明 Content string `json:"content"` //指标说明
@ -473,7 +473,7 @@ type taskDetails struct {
QeId string `json:"qeid"` QeId string `json:"qeid"`
} }
//具体职责输出 // 具体职责输出
type taskDatalsContOut struct { type taskDatalsContOut struct {
Id int64 `json:"id" gorm:"column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"` Id int64 `json:"id" gorm:"column:qe_id;type:bigint(20) unsigned;not null;comment:Id;index"`
DetailedTarget int64 `json:"detailedtarget" gorm:"column:qe_detailed_target;type:bigint(20) unsigned;default:0;not null;comment:考核细则"` DetailedTarget int64 `json:"detailedtarget" gorm:"column:qe_detailed_target;type:bigint(20) unsigned;default:0;not null;comment:考核细则"`
@ -484,38 +484,38 @@ type taskDatalsContOut struct {
State int `json:"state" gorm:"column:qe_state;type:int(1) unsigned;default:1;not null;comment:状态(1:启用;2:禁用;3:删除)"` State int `json:"state" gorm:"column:qe_state;type:int(1) unsigned;default:1;not null;comment:状态(1:启用;2:禁用;3:删除)"`
} }
//定量指标 // 定量指标
type QualEvalRationListOut struct { type QualEvalRationListOut struct {
QualEvalArrt QualEvalArrt
Child []QualEvalRationListOutDepart `json:"child"` //定量考核部门 Child []QualEvalRationListOutDepart `json:"child"` //定量考核部门
} }
//定量考核部门 // 定量考核部门
type QualEvalRationListOutDepart struct { type QualEvalRationListOutDepart struct {
QualEvalArrt QualEvalArrt
Child []DimensionRationList `json:"child"` //维度列表 Child []DimensionRationList `json:"child"` //维度列表
} }
//定量考核列表维度项目 // 定量考核列表维度项目
type DimensionRationList struct { type DimensionRationList struct {
QualEvalArrt QualEvalArrt
Child []taskDetails `json:"child"` //定量指标 Child []taskDetails `json:"child"` //定量指标
} }
//定量指标 // 定量指标
type TargetRationList struct { type TargetRationList struct {
QualEvalArrt QualEvalArrt
Child []taskDetails `json:"child"` //定量指标子栏目 Child []taskDetails `json:"child"` //定量指标子栏目
} }
//获取相关任务目标 // 获取相关任务目标
type taskTargetList struct { type taskTargetList struct {
Type int `json:"type"` //1:定性考核;2:定量考核 Type int `json:"type"` //1:定性考核;2:定量考核
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DepartMent []string `json:"department"` DepartMent []string `json:"department"`
} }
//根据条件获取考核细则 // 根据条件获取考核细则
type SelectTaskTarget struct { type SelectTaskTarget struct {
Type int `json:"type"` //1:定性考核;2:定量考核 Type int `json:"type"` //1:定性考核;2:定量考核
TargetId string `json:"targetid"` TargetId string `json:"targetid"`
@ -533,7 +533,7 @@ type AddRationCont struct {
RationList []rationList `json:"rationlist"` //考核明细列表 RationList []rationList `json:"rationlist"` //考核明细列表
} }
//定量考核明细 // 定量考核明细
type rationList struct { type rationList struct {
Target string `json:"id"` //考核指标 Target string `json:"id"` //考核指标
DepartmentId string `json:"parentid"` //执行考核部门ID DepartmentId string `json:"parentid"` //执行考核部门ID
@ -544,13 +544,13 @@ type rationList struct {
Operator []string `json:"userlist"` //考核执行人 Operator []string `json:"userlist"` //考核执行人
} }
//定量考核列表查询 // 定量考核列表查询
type rationSelect struct { type rationSelect struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DepartmentId string `json:"parentid"` //接受考核部门 DepartmentId string `json:"parentid"` //接受考核部门
} }
//部门考核 // 部门考核
type deparMentModelOld struct { type deparMentModelOld struct {
Id int64 `json:"id" gorm:"column:bf_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"` Id int64 `json:"id" gorm:"column:bf_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"`
Name string `json:"name" gorm:"column:bf_name;type:varchar(30);not null;comment:分厂名称"` //'分厂名称', Name string `json:"name" gorm:"column:bf_name;type:varchar(30);not null;comment:分厂名称"` //'分厂名称',
@ -562,13 +562,13 @@ type deparMentModel struct {
WechatId int `json:"wechatid" gorm:"column:wechat_organization_id;type:int(4) unsigned;default:0;not null;comment:对照微信id"` //'对照微信id', WechatId int `json:"wechatid" gorm:"column:wechat_organization_id;type:int(4) unsigned;default:0;not null;comment:对照微信id"` //'对照微信id',
} }
//部门考核输出列表 // 部门考核输出列表
type departmentDuty struct { type departmentDuty struct {
QualEvalArrt QualEvalArrt
Child []departmentDimension `json:"child"` //考核细则 Child []departmentDimension `json:"child"` //考核细则
} }
//部门考核维度输出列表 // 部门考核维度输出列表
type departmentDimension struct { type departmentDimension struct {
QualEvalArrt QualEvalArrt
Content string `json:"content"` //说明 Content string `json:"content"` //说明
@ -577,7 +577,7 @@ type departmentDimension struct {
Child []taskDetails `json:"child"` //考核细则 Child []taskDetails `json:"child"` //考核细则
} }
//考核细则联动列表 // 考核细则联动列表
type taskDetailsLinkage struct { type taskDetailsLinkage struct {
QualEvalArrt QualEvalArrt
Content string `json:"content"` //指标说明 Content string `json:"content"` //指标说明
@ -591,7 +591,7 @@ type taskDetailsLinkage struct {
IsTrue int `json:"istrue"` //是否允许修改 IsTrue int `json:"istrue"` //是否允许修改
} }
//添加定性考核权重 // 添加定性考核权重
type addDepartmentDimensionWeight struct { type addDepartmentDimensionWeight struct {
Hierarchy int64 `json:"hierarchy"` //层级 Hierarchy int64 `json:"hierarchy"` //层级
Type int64 `json:"type"` //1:定性考核;2:定量考核 Type int64 `json:"type"` //1:定性考核;2:定量考核
@ -602,7 +602,7 @@ type addDepartmentDimensionWeight struct {
Weight int64 `json:"weight"` //权重 Weight int64 `json:"weight"` //权重
} }
//批量添加指标权重 // 批量添加指标权重
type addDepartDimensionWeightAry struct { type addDepartDimensionWeightAry struct {
// Hierarchy int64 `json:"hierarchy"` //层级 // Hierarchy int64 `json:"hierarchy"` //层级
Type int64 `json:"type"` //1:定性考核;2:定量考核 Type int64 `json:"type"` //1:定性考核;2:定量考核
@ -616,7 +616,7 @@ type targetListType struct {
Weight int64 `json:"weight"` //权重 Weight int64 `json:"weight"` //权重
} }
//批量添加维度权重 // 批量添加维度权重
type addDepartDimenWeightAry struct { type addDepartDimenWeightAry struct {
// Hierarchy int64 `json:"hierarchy"` //层级 // Hierarchy int64 `json:"hierarchy"` //层级
Type int64 `json:"type"` //1:定性考核;2:定量考核 Type int64 `json:"type"` //1:定性考核;2:定量考核
@ -625,12 +625,12 @@ type addDepartDimenWeightAry struct {
Dimension []targetListType `json:"dimension"` //维度 Dimension []targetListType `json:"dimension"` //维度
} }
//获取定量考核相关列表 // 获取定量考核相关列表
type getDaulEvalDuty struct { type getDaulEvalDuty struct {
assessmentmodel.EvaluationTarget assessmentmodel.EvaluationTarget
} }
//获取部门考核指标详情 // 获取部门考核指标详情
type QualitativeEite struct { type QualitativeEite struct {
Dimension string `json:"dimension"` //考核维度 Dimension string `json:"dimension"` //考核维度
Target string `json:"target"` //考核指标 Target string `json:"target"` //考核指标
@ -639,7 +639,7 @@ type QualitativeEite struct {
DepartmentId string `json:"departmentid"` //接受考核部门 DepartmentId string `json:"departmentid"` //接受考核部门
} }
//输出部门考核指标详情 // 输出部门考核指标详情
type QualitativeEiteOut struct { type QualitativeEiteOut struct {
Group string `json:"group"` //归属集团 Group string `json:"group"` //归属集团
DepartmentId string `json:"departmentid"` //接受考核部门 DepartmentId string `json:"departmentid"` //接受考核部门
@ -659,13 +659,13 @@ type DelQualitative struct {
VersionNumber string `json:"versionnumber"` //版本号码 VersionNumber string `json:"versionnumber"` //版本号码
} }
//根据条件获取组合指标新的输出模式 // 根据条件获取组合指标新的输出模式
type GetTaskTargetNewList struct { type GetTaskTargetNewList struct {
assessmentmodel.EvaluationTarget assessmentmodel.EvaluationTarget
ReportList []string `json:"reportlist"` //上报人 ReportList []string `json:"reportlist"` //上报人
} }
//考核方案细则列表输出 // 考核方案细则列表输出
type TargetContOutCont struct { type TargetContOutCont struct {
Id string `json:"id"` Id string `json:"id"`
Type int `json:"type"` Type int `json:"type"`
@ -694,7 +694,7 @@ type TargetContOutCont struct {
MinOrMaxScore string `json:"score"` //参考分值 MinOrMaxScore string `json:"score"` //参考分值
} }
//修改考核方案单条细则 // 修改考核方案单条细则
type EiteOneQualEval struct { type EiteOneQualEval struct {
commonus.SetIds commonus.SetIds
Content string `json:"content"` //指标说明 Content string `json:"content"` //指标说明
@ -706,13 +706,13 @@ type EiteOneQualEval struct {
Operator []string `json:"operator"` //执行人列表 Operator []string `json:"operator"` //执行人列表
} }
//考核卡片添加 // 考核卡片添加
type addAssEssCard struct { type addAssEssCard struct {
AddQualEval AddQualEval
TargetSunTitle string `json:"targetsuntitle"` TargetSunTitle string `json:"targetsuntitle"`
} }
//定性考核指标对应的结构树参数 // 定性考核指标对应的结构树参数
type QualEvalTargetTreeDies struct { type QualEvalTargetTreeDies struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
DepartmentId string `json:"parentid"` //部门 DepartmentId string `json:"parentid"` //部门
@ -720,7 +720,7 @@ type QualEvalTargetTreeDies struct {
Target string `json:"target"` //指标 Target string `json:"target"` //指标
} }
//添加部门考核项目新 // 添加部门考核项目新
type AddDutyNewContGroup struct { type AddDutyNewContGroup struct {
Group string `json:"group"` //集团 Group string `json:"group"` //集团
DepartmentId string `json:"parentid"` //部门 DepartmentId string `json:"parentid"` //部门
@ -734,7 +734,7 @@ type AddDutyNewCont struct {
Child []EvaluPross `json:"child"` //考核细则 Child []EvaluPross `json:"child"` //考核细则
} }
//指标 // 指标
type EvaluPross struct { type EvaluPross struct {
Id string `json:"id"` //维度ID Id string `json:"id"` //维度ID
Name string `json:"name"` Name string `json:"name"`
@ -749,13 +749,13 @@ type EvaluPross struct {
Status int `json:"status"` Status int `json:"status"`
} }
//部门考核输出列表 // 部门考核输出列表
type departmentDutyNew struct { type departmentDutyNew struct {
QualEvalArrt QualEvalArrt
Child []taskDetailsLinkage `json:"child"` //考核细则 Child []taskDetailsLinkage `json:"child"` //考核细则
} }
//设定指标结算周期 // 设定指标结算周期
type SetEvaluationObjectives struct { type SetEvaluationObjectives struct {
Year int64 `json:"year"` //年度 Year int64 `json:"year"` //年度
Group int64 `json:"group"` //集团 Group int64 `json:"group"` //集团
@ -767,7 +767,7 @@ type SetEvaluationObjectives struct {
CycleAdded []CycleAddedType `json:"cycleadded"` CycleAdded []CycleAddedType `json:"cycleadded"`
} }
//周期列表 // 周期列表
type CycleAddedType struct { type CycleAddedType struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Zeroprize float64 `json:"zeroprize"` //零奖值"` Zeroprize float64 `json:"zeroprize"` //零奖值"`
@ -775,7 +775,7 @@ type CycleAddedType struct {
Capping float64 `json:"capping"` //封顶值"` Capping float64 `json:"capping"` //封顶值"`
} }
//添加 定性考核指标关系指定细则 // 添加 定性考核指标关系指定细则
type DutyAssEssTarget struct { type DutyAssEssTarget struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Operator []string `json:"operator"` //考核执行人 Operator []string `json:"operator"` //考核执行人

8
api/v1/assessment/newassessment.go

@ -6,12 +6,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
//添加卡片考核数据处理 // 添加卡片考核数据处理
func (d *dataLockStatistics) AddCardAssEss(deparmentId string, addData AddQualEval) { func (d *dataLockStatistics) AddCardAssEss(deparmentId string, addData AddQualEval) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()

14
api/v1/assessment/programme.go

@ -6,10 +6,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -21,7 +21,7 @@ func (a *EvaluationScheme) Index(c *gin.Context) {
response.Result(0, outPut, "测评方案获取成功", c) response.Result(0, outPut, "测评方案获取成功", c)
} }
//添加考核方案 // 添加考核方案
func (a *EvaluationScheme) AddEvaluationScheme(c *gin.Context) { func (a *EvaluationScheme) AddEvaluationScheme(c *gin.Context) {
var requestData AddScheme var requestData AddScheme
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -85,7 +85,7 @@ func (a *EvaluationScheme) AddEvaluationScheme(c *gin.Context) {
} }
//并发写入考核方案 // 并发写入考核方案
func (d *dataLockStatistics) addEvaluationSchemeHandel(departId int64, addData AddScheme) { func (d *dataLockStatistics) addEvaluationSchemeHandel(departId int64, addData AddScheme) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()
@ -166,7 +166,7 @@ func (d *dataLockStatistics) addEvaluationSchemeHandel(departId int64, addData A
syncProcess.Done() syncProcess.Done()
} }
//判断要新增的考核细则 // 判断要新增的考核细则
func (d *dataLockStatistics) NewsAddRules(parentId int64, dataAry []schemeContent) (rulesSaveData []map[string]interface{}, isTrue bool) { func (d *dataLockStatistics) NewsAddRules(parentId int64, dataAry []schemeContent) (rulesSaveData []map[string]interface{}, isTrue bool) {
isTrue = false isTrue = false
for _, val := range dataAry { for _, val := range dataAry {

40
api/v1/assessment/qualitative_evaluation.go

@ -6,11 +6,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -179,7 +179,7 @@ func (d *dataLockStatistics) addQualEvalList(departmentId string, addData AddQua
syncProcess.Done() syncProcess.Done()
} }
//定性考核列表 // 定性考核列表
func (d *DutyHandle) GetQualEvalList(c *gin.Context) { func (d *DutyHandle) GetQualEvalList(c *gin.Context) {
var requestData SelectQualEval var requestData SelectQualEval
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -225,7 +225,7 @@ func (d *DutyHandle) GetQualEvalList(c *gin.Context) {
response.Result(0, aualEvalArrtAry, "查询完成!", c) response.Result(0, aualEvalArrtAry, "查询完成!", c)
} }
//归档部门 // 归档部门
func deparmentList(groupID int64, departmentIDStr string) (contentList []QualEvalListOutDepart, isTrue bool) { func deparmentList(groupID int64, departmentIDStr string) (contentList []QualEvalListOutDepart, isTrue bool) {
isTrue = false isTrue = false
gormDbDepart := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("qe_type = 1 AND `qe_group` = ?", groupID).Group("qe_accept_evaluation") gormDbDepart := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("qe_type = 1 AND `qe_group` = ?", groupID).Group("qe_accept_evaluation")
@ -265,7 +265,7 @@ func deparmentList(groupID int64, departmentIDStr string) (contentList []QualEva
return return
} }
//归档维度 // 归档维度
func dimensionList(groupID, departmentID int64) (contentList []DimensionList, isTrue bool) { func dimensionList(groupID, departmentID int64) (contentList []DimensionList, isTrue bool) {
isTrue = false isTrue = false
var fileDimensionAry []int64 var fileDimensionAry []int64
@ -294,7 +294,7 @@ func dimensionList(groupID, departmentID int64) (contentList []DimensionList, is
return return
} }
//查询归档定性指标 // 查询归档定性指标
func targetList(groupID, departmentID, dimension int64) (contentList []TargetList, isTrue bool) { func targetList(groupID, departmentID, dimension int64) (contentList []TargetList, isTrue bool) {
isTrue = false isTrue = false
var fileTargetAry []int64 var fileTargetAry []int64
@ -323,7 +323,7 @@ func targetList(groupID, departmentID, dimension int64) (contentList []TargetLis
return return
} }
//查询归档定性子栏目 // 查询归档定性子栏目
func targetSunList(groupID, departmentID, dimension, targetId int64) (contentList []TargetSunList, isTrue bool) { func targetSunList(groupID, departmentID, dimension, targetId int64) (contentList []TargetSunList, isTrue bool) {
isTrue = false isTrue = false
var fileTargetSunAry []int64 var fileTargetSunAry []int64
@ -351,7 +351,7 @@ func targetSunList(groupID, departmentID, dimension, targetId int64) (contentLis
return return
} }
//考核细则 // 考核细则
func taskDetailsList(groupID, departmentID, dimension, targetId, targetSunId int64) (contentList []taskDetails, isTrue bool) { func taskDetailsList(groupID, departmentID, dimension, targetId, targetSunId int64) (contentList []taskDetails, isTrue bool) {
isTrue = false isTrue = false
var taskDetailsCont []taskDatalsContOut var taskDetailsCont []taskDatalsContOut
@ -382,7 +382,7 @@ func taskDetailsList(groupID, departmentID, dimension, targetId, targetSunId int
return return
} }
//获取考核指标 // 获取考核指标
func (d *DutyHandle) GetTaskTarget(c *gin.Context) { func (d *DutyHandle) GetTaskTarget(c *gin.Context) {
var requestData taskTargetList var requestData taskTargetList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -447,7 +447,7 @@ func (d *DutyHandle) GetTaskTarget(c *gin.Context) {
response.Result(0, taskTargetNewOut, "数据获取成功!", c) response.Result(0, taskTargetNewOut, "数据获取成功!", c)
} }
//获取定性指标子栏目 // 获取定性指标子栏目
func (d *DutyHandle) GetTaskTargetSun(c *gin.Context) { func (d *DutyHandle) GetTaskTargetSun(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -474,7 +474,7 @@ func (d *DutyHandle) GetTaskTargetSun(c *gin.Context) {
response.Result(0, contAry, "数据获取成功!", c) response.Result(0, contAry, "数据获取成功!", c)
} }
//根据条件获取考核详情 // 根据条件获取考核详情
func (d *DutyHandle) GetTaskTargetContAry(c *gin.Context) { func (d *DutyHandle) GetTaskTargetContAry(c *gin.Context) {
var requestData SelectTaskTarget var requestData SelectTaskTarget
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -540,7 +540,7 @@ func (d *DutyHandle) GetTaskTargetContAry(c *gin.Context) {
response.Result(0, outContList, "数据获取成功!", c) response.Result(0, outContList, "数据获取成功!", c)
} }
//添加定性考核权重 // 添加定性考核权重
func (d *DutyHandle) AddQualEvalWeight(c *gin.Context) { func (d *DutyHandle) AddQualEvalWeight(c *gin.Context) {
var requestData addDepartmentDimensionWeight var requestData addDepartmentDimensionWeight
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -621,7 +621,7 @@ func (d *DutyHandle) AddQualEvalWeight(c *gin.Context) {
response.Result(0, saveData, "数据写入成功!", c) response.Result(0, saveData, "数据写入成功!", c)
} }
//批量添加指标权重 // 批量添加指标权重
func (d *DutyHandle) AddQualEvalDimWeightBatch(c *gin.Context) { func (d *DutyHandle) AddQualEvalDimWeightBatch(c *gin.Context) {
var requestData addDepartDimensionWeightAry var requestData addDepartDimensionWeightAry
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -762,7 +762,7 @@ func (d *DutyHandle) AddQualEvalDimWeightBatch(c *gin.Context) {
response.Result(0, sumScore, "数据写入成功", c) response.Result(0, sumScore, "数据写入成功", c)
} }
//批量添加维度权重 // 批量添加维度权重
func (d *DutyHandle) AddDimWeightBatch(c *gin.Context) { func (d *DutyHandle) AddDimWeightBatch(c *gin.Context) {
var requestData addDepartDimenWeightAry var requestData addDepartDimenWeightAry
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -847,7 +847,7 @@ func (d *DutyHandle) AddDimWeightBatch(c *gin.Context) {
response.Result(0, depDimIdAry, "数据写入成功", c) response.Result(0, depDimIdAry, "数据写入成功", c)
} }
//获取部门考核指标详情 // 获取部门考核指标详情
func (d *DutyHandle) GetQualEval(c *gin.Context) { func (d *DutyHandle) GetQualEval(c *gin.Context) {
var requestData QualitativeEite var requestData QualitativeEite
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -928,7 +928,7 @@ func (d *DutyHandle) GetQualEval(c *gin.Context) {
response.Result(0, quaOutAry, "数据获取成功!", c) response.Result(0, quaOutAry, "数据获取成功!", c)
} }
//修改定性考核内容 // 修改定性考核内容
func (d *DutyHandle) EiteQualEvalCont(c *gin.Context) { func (d *DutyHandle) EiteQualEvalCont(c *gin.Context) {
var requestData QualitativeEiteOut var requestData QualitativeEiteOut
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1104,7 +1104,7 @@ func (d *DutyHandle) EiteQualEvalCont(c *gin.Context) {
} }
//删除定性考核 // 删除定性考核
func (d *DutyHandle) DelQualEvalCont(c *gin.Context) { func (d *DutyHandle) DelQualEvalCont(c *gin.Context) {
var requestData DelQualitative var requestData DelQualitative
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

18
api/v1/assessment/qualitative_target.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -15,7 +15,7 @@ import (
定性指标子栏目 定性指标子栏目
*/ */
//添加定性指标子栏目 // 添加定性指标子栏目
func (d *DutyHandle) AddQualitativeTarget(c *gin.Context) { func (d *DutyHandle) AddQualitativeTarget(c *gin.Context) {
var requestData addAttTarget var requestData addAttTarget
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -55,7 +55,7 @@ func (d *DutyHandle) AddQualitativeTarget(c *gin.Context) {
} }
} }
//获取定性指标子栏目列表 // 获取定性指标子栏目列表
func (d *DutyHandle) GetQualitativeTargetList(c *gin.Context) { func (d *DutyHandle) GetQualitativeTargetList(c *gin.Context) {
var requestData attTargetList var requestData attTargetList
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -116,7 +116,7 @@ func (d *DutyHandle) GetQualitativeTargetList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//编辑指标数据处理 // 编辑指标数据处理
func eiteQualTargetInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) { func eiteQualTargetInfoes(saveId int64, saveData map[string]interface{}) (isTrue bool, infoErr error) {
isTrue = false isTrue = false
infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Where("`q_id` = ?", saveId).Updates(saveData).Error infoErr = global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeTarget{}).Where("`q_id` = ?", saveId).Updates(saveData).Error
@ -127,7 +127,7 @@ func eiteQualTargetInfoes(saveId int64, saveData map[string]interface{}) (isTrue
return return
} }
//获取定性测评指标子栏目详细内容 // 获取定性测评指标子栏目详细内容
func (d *DutyHandle) GetQualTargetInfo(c *gin.Context) { func (d *DutyHandle) GetQualTargetInfo(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -160,7 +160,7 @@ func (d *DutyHandle) GetQualTargetInfo(c *gin.Context) {
response.Result(0, systemEvalCont, "数据获取成功!", c) response.Result(0, systemEvalCont, "数据获取成功!", c)
} }
//修改定性指标子栏目 // 修改定性指标子栏目
func (d *DutyHandle) EiteQualTargetInfo(c *gin.Context) { func (d *DutyHandle) EiteQualTargetInfo(c *gin.Context) {
var requestData eiteAttTarget var requestData eiteAttTarget
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

28
api/v1/assessment/ration_evaluation.go

@ -6,12 +6,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -189,7 +189,7 @@ func (d *dataLockStatistics) addRationContList(deparmentId string, addData AddRa
syncProcess.Done() syncProcess.Done()
} }
//批量获取相关人员部门id // 批量获取相关人员部门id
func GetDepartmentByUserBast(userKey []string) (userDepartmentId []string) { func GetDepartmentByUserBast(userKey []string) (userDepartmentId []string) {
if len(userKey) < 1 { if len(userKey) < 1 {
return return
@ -208,7 +208,7 @@ func GetDepartmentByUserBast(userKey []string) (userDepartmentId []string) {
return return
} }
//定量考核方案列表 // 定量考核方案列表
func (d *DutyHandle) RationList(c *gin.Context) { func (d *DutyHandle) RationList(c *gin.Context) {
var requestData rationSelect var requestData rationSelect
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -253,7 +253,7 @@ func (d *DutyHandle) RationList(c *gin.Context) {
response.Result(0, aualEvalArrtAry, "查询完成!", c) response.Result(0, aualEvalArrtAry, "查询完成!", c)
} }
//归档部门 // 归档部门
func deparmentRationList(groupID int64, departmentIDStr string) (contentList []QualEvalRationListOutDepart, isTrue bool) { func deparmentRationList(groupID int64, departmentIDStr string) (contentList []QualEvalRationListOutDepart, isTrue bool) {
isTrue = false isTrue = false
gormDbDepart := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("qe_type = 2 AND `qe_group` = ?", groupID).Group("qe_accept_evaluation") gormDbDepart := global.GVA_DB_Performanceappraisal.Model(&assessmentmodel.QualitativeEvaluation{}).Select("qe_accept_evaluation").Where("qe_type = 2 AND `qe_group` = ?", groupID).Group("qe_accept_evaluation")
@ -293,7 +293,7 @@ func deparmentRationList(groupID int64, departmentIDStr string) (contentList []Q
return return
} }
//归档维度 // 归档维度
func dimensionRationList(groupID, departmentID int64) (contentList []DimensionRationList, isTrue bool) { func dimensionRationList(groupID, departmentID int64) (contentList []DimensionRationList, isTrue bool) {
isTrue = false isTrue = false
var fileDimensionAry []int64 var fileDimensionAry []int64
@ -322,7 +322,7 @@ func dimensionRationList(groupID, departmentID int64) (contentList []DimensionRa
return return
} }
//查询归档定性指标 // 查询归档定性指标
func targetRationList(groupID, departmentID, dimension int64) (contentList []taskDetails, isTrue bool) { func targetRationList(groupID, departmentID, dimension int64) (contentList []taskDetails, isTrue bool) {
isTrue = false isTrue = false
var fileTargetAry []assessmentmodel.QualitativeEvaluation var fileTargetAry []assessmentmodel.QualitativeEvaluation
@ -353,7 +353,7 @@ func targetRationList(groupID, departmentID, dimension int64) (contentList []tas
return return
} }
//删除定量考核 // 删除定量考核
func (d *DutyHandle) DelRationList(c *gin.Context) { func (d *DutyHandle) DelRationList(c *gin.Context) {
var requestData DelQualitative var requestData DelQualitative
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -390,7 +390,7 @@ func (d *DutyHandle) DelRationList(c *gin.Context) {
} }
} }
//获取定量考核 // 获取定量考核
func (d *DutyHandle) GetRationList(c *gin.Context) { func (d *DutyHandle) GetRationList(c *gin.Context) {
var requestData QualitativeEite var requestData QualitativeEite
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -463,7 +463,7 @@ func (d *DutyHandle) GetRationList(c *gin.Context) {
response.Result(0, quaOutAry, "数据获取成功!", c) response.Result(0, quaOutAry, "数据获取成功!", c)
} }
//修改定量考核 // 修改定量考核
func (d *DutyHandle) EiteRationList(c *gin.Context) { func (d *DutyHandle) EiteRationList(c *gin.Context) {
var requestData QualitativeEiteOut var requestData QualitativeEiteOut
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

8
api/v1/assessment/set_evaluation_objectives.go

@ -4,10 +4,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

32
api/v1/assessment/specificduty.go

@ -4,16 +4,16 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/flipped-aurora/gin-vue-admin/server/model/wechat" "gin_server_admin/model/wechat"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//具体部门职责 // 具体部门职责
func (d *DutyHandle) SpecificDutyList(c *gin.Context) { func (d *DutyHandle) SpecificDutyList(c *gin.Context) {
var requestData specificDutyRequest var requestData specificDutyRequest
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -107,7 +107,7 @@ func (d *DutyHandle) SpecificDutyList(c *gin.Context) {
response.Result(0, printData, "查询成功!", c) response.Result(0, printData, "查询成功!", c)
} }
//添加具体职责 // 添加具体职责
func (d *DutyHandle) AddSpecificDutyInfo(c *gin.Context) { func (d *DutyHandle) AddSpecificDutyInfo(c *gin.Context) {
var requestData addSpecificDutyCont var requestData addSpecificDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -176,7 +176,7 @@ func (d *DutyHandle) AddSpecificDutyInfo(c *gin.Context) {
} }
} }
//添加部门具体职责 // 添加部门具体职责
func (d *DutyHandle) AddDepartDutyInfo(c *gin.Context) { func (d *DutyHandle) AddDepartDutyInfo(c *gin.Context) {
var requestData addDepartDutyCont var requestData addDepartDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -255,7 +255,7 @@ func (d *DutyHandle) AddDepartDutyInfo(c *gin.Context) {
} }
} }
//编辑具体内容 // 编辑具体内容
func (d *DutyHandle) EiteDepartDutyInfo(c *gin.Context) { func (d *DutyHandle) EiteDepartDutyInfo(c *gin.Context) {
var requestData eiteDepartDutyCont var requestData eiteDepartDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -320,7 +320,7 @@ func (d *DutyHandle) EiteDepartDutyInfo(c *gin.Context) {
} }
//获取部门具体考核项目 // 获取部门具体考核项目
func (d *DutyHandle) GetSpecDutyCont(c *gin.Context) { func (d *DutyHandle) GetSpecDutyCont(c *gin.Context) {
var requestData commonus.SetId var requestData commonus.SetId
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -384,7 +384,7 @@ func (d *DutyHandle) GetSpecDutyCont(c *gin.Context) {
response.Result(0, dutyOutInfo, "数据查询成功!", c) response.Result(0, dutyOutInfo, "数据查询成功!", c)
} }
//获取集团信息 // 获取集团信息
func GetGroupCont(id int64) (isTrue bool, ContInfo wechat.GroupForm) { func GetGroupCont(id int64) (isTrue bool, ContInfo wechat.GroupForm) {
isTrue = false isTrue = false
err := global.GVA_DB_WatchDate.Where("g_id = ?", id).First(&ContInfo).Error err := global.GVA_DB_WatchDate.Where("g_id = ?", id).First(&ContInfo).Error
@ -394,7 +394,7 @@ func GetGroupCont(id int64) (isTrue bool, ContInfo wechat.GroupForm) {
return return
} }
//获得分厂名称 // 获得分厂名称
func GetBranchFactory(id int64) (isTrue bool, ContInfo testpage.BranchFactory) { func GetBranchFactory(id int64) (isTrue bool, ContInfo testpage.BranchFactory) {
isTrue = false isTrue = false
err := global.GVA_DB_Master.Where("bf_id = ?", id).First(&ContInfo).Error err := global.GVA_DB_Master.Where("bf_id = ?", id).First(&ContInfo).Error
@ -404,7 +404,7 @@ func GetBranchFactory(id int64) (isTrue bool, ContInfo testpage.BranchFactory) {
return return
} }
//编辑具体内容 // 编辑具体内容
func (d *DutyHandle) EiteSpecFicDutyInfo(c *gin.Context) { func (d *DutyHandle) EiteSpecFicDutyInfo(c *gin.Context) {
var requestData eiteSpecificDutyCont var requestData eiteSpecificDutyCont
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -470,7 +470,7 @@ func (d *DutyHandle) EiteSpecFicDutyInfo(c *gin.Context) {
} }
//编辑具体职责内容 // 编辑具体职责内容
func eiteSpecificDutyInfoCont(saveId int64, saveData map[string]interface{}) (isTrue bool, dutyClassInfoErr error) { func eiteSpecificDutyInfoCont(saveId int64, saveData map[string]interface{}) (isTrue bool, dutyClassInfoErr error) {
var modelInfo assessmentmodel.DepartDuty var modelInfo assessmentmodel.DepartDuty
isTrue = false isTrue = false
@ -482,7 +482,7 @@ func eiteSpecificDutyInfoCont(saveId int64, saveData map[string]interface{}) (is
return return
} }
//修改考核项目的状态 // 修改考核项目的状态
func (d *DutyHandle) EiteSpecficDutyState(c *gin.Context) { func (d *DutyHandle) EiteSpecficDutyState(c *gin.Context) {
var requestData dutyClassState var requestData dutyClassState
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)

12
api/v1/assessment/target.go

@ -7,12 +7,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

12
api/v1/autocode/autocodeExample.go

@ -1,12 +1,12 @@
package autocode package autocode
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/autocode" "gin_server_admin/model/autocode"
autocodeReq "github.com/flipped-aurora/gin-vue-admin/server/model/autocode/request" autocodeReq "gin_server_admin/model/autocode/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/service" "gin_server_admin/service"
"github.com/flipped-aurora/gin-vue-admin/server/utils" "gin_server_admin/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
api/v1/autocode/enter.go

@ -1,7 +1,7 @@
package autocode package autocode
type ApiGroup struct { type ApiGroup struct {
// Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT. // Code generated by gin_server_admin Begin; DO NOT EDIT.
AutoCodeExampleApi AutoCodeExampleApi
// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT. // Code generated by gin_server_admin End; DO NOT EDIT.
} }

32
api/v1/custom/customhandle.go

@ -5,21 +5,21 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/flipped-aurora/gin-vue-admin/server/api/admin/systemuser" "gin_server_admin/api/admin/systemuser"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/staff" "gin_server_admin/api/v1/staff"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" systemReq "gin_server_admin/model/system/request"
roleModel "github.com/flipped-aurora/gin-vue-admin/server/model/systemuser" roleModel "gin_server_admin/model/systemuser"
"github.com/flipped-aurora/gin-vue-admin/server/utils" "gin_server_admin/utils"
"github.com/flipped-aurora/gin-vue-admin/server/utils/redishandel" "gin_server_admin/utils/redishandel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//自定义登录 // 自定义登录
func (cu *CustomHandle) CustomLogin(c *gin.Context) { func (cu *CustomHandle) CustomLogin(c *gin.Context) {
var l systemReq.Login var l systemReq.Login
_ = c.ShouldBindJSON(&l) _ = c.ShouldBindJSON(&l)
@ -100,7 +100,7 @@ func (cu *CustomHandle) CustomLogin(c *gin.Context) {
// } // }
} }
//自定义登录 // 自定义登录
func (cu *CustomHandle) SystemLogin(c *gin.Context) { func (cu *CustomHandle) SystemLogin(c *gin.Context) {
var l systemReq.Login var l systemReq.Login
_ = c.ShouldBindJSON(&l) _ = c.ShouldBindJSON(&l)
@ -212,7 +212,7 @@ func (cu *CustomHandle) SystemLogin(c *gin.Context) {
// } // }
} }
//oauth2.0 // oauth2.0
func (cu *CustomHandle) OauthTwo(c *gin.Context) { func (cu *CustomHandle) OauthTwo(c *gin.Context) {
var requestData getData var requestData getData
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -251,7 +251,7 @@ func (cu *CustomHandle) OauthTwo(c *gin.Context) {
} }
} }
//企业微信单点登录 // 企业微信单点登录
func (cu *CustomHandle) SingleSignOn(c *gin.Context) { func (cu *CustomHandle) SingleSignOn(c *gin.Context) {
var requestData oneLogin var requestData oneLogin
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -343,7 +343,7 @@ func (cu *CustomHandle) SingleSignOn(c *gin.Context) {
response.Result(0, saveData, "登录成功!", c) response.Result(0, saveData, "登录成功!", c)
} }
//一端登录 // 一端登录
func (cu *CustomHandle) ScanCodeLogin(c *gin.Context) { func (cu *CustomHandle) ScanCodeLogin(c *gin.Context) {
var l systemReq.Login var l systemReq.Login
_ = c.ShouldBindJSON(&l) _ = c.ShouldBindJSON(&l)
@ -582,7 +582,7 @@ func (cu *CustomHandle) ScanCodeLogin(c *gin.Context) {
} }
//获取角色信息 // 获取角色信息
func getRole(roleId int64) (roleCont roleModel.SystemRole) { func getRole(roleId int64) (roleCont roleModel.SystemRole) {
global.GVA_DB_HrDataBase.Where("`id` = ?", roleId).Find(&roleCont) global.GVA_DB_HrDataBase.Where("`id` = ?", roleId).Find(&roleCont)
return return

26
api/v1/enter.go

@ -1,19 +1,19 @@
package v1 package v1
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/archiveapi" "gin_server_admin/api/v1/archiveapi"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/assessment" "gin_server_admin/api/v1/assessment"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/autocode" "gin_server_admin/api/v1/autocode"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/custom" "gin_server_admin/api/v1/custom"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/examination" "gin_server_admin/api/v1/examination"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/example" "gin_server_admin/api/v1/example"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/examtestpage" "gin_server_admin/api/v1/examtestpage"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/fileuploaddownload" "gin_server_admin/api/v1/fileuploaddownload"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/positionkpi" "gin_server_admin/api/v1/positionkpi"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/shiyan" "gin_server_admin/api/v1/shiyan"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/staff" "gin_server_admin/api/v1/staff"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/system" "gin_server_admin/api/v1/system"
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/wechatcallback" "gin_server_admin/api/v1/wechatcallback"
) )
type ApiGroup struct { type ApiGroup struct {

8
api/v1/examination/exampage.go

@ -1,15 +1,15 @@
package examination package examination
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//考试相关 // 考试相关
type ExaminationPage struct{} type ExaminationPage struct{}
//首页 // 首页
func (e *ExaminationPage) Index(c *gin.Context) { func (e *ExaminationPage) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "试卷获取成功", c) response.Result(0, outPut, "试卷获取成功", c)

8
api/v1/examination/testquestions.go

@ -1,15 +1,15 @@
package examination package examination
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//试题相关操作 // 试题相关操作
type TestQuestions struct{} type TestQuestions struct{}
//首页 // 首页
func (e *TestQuestions) Index(c *gin.Context) { func (e *TestQuestions) Index(c *gin.Context) {
outPut := commonus.MapOut() outPut := commonus.MapOut()
response.Result(0, outPut, "试题获取成功", c) response.Result(0, outPut, "试题获取成功", c)

2
api/v1/example/enter.go

@ -1,6 +1,6 @@
package example package example
import "github.com/flipped-aurora/gin-vue-admin/server/service" import "gin_server_admin/service"
type ApiGroup struct { type ApiGroup struct {
CustomerApi CustomerApi

8
api/v1/example/exa_breakpoint_continue.go

@ -6,10 +6,10 @@ import (
"mime/multipart" "mime/multipart"
"strconv" "strconv"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response" exampleRes "gin_server_admin/model/example/response"
"github.com/flipped-aurora/gin-vue-admin/server/utils" "gin_server_admin/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )

12
api/v1/example/exa_customer.go

@ -1,12 +1,12 @@
package example package example
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request" "gin_server_admin/model/common/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/example" "gin_server_admin/model/example"
exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response" exampleRes "gin_server_admin/model/example/response"
"github.com/flipped-aurora/gin-vue-admin/server/utils" "gin_server_admin/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )

8
api/v1/example/exa_excel.go

@ -1,10 +1,10 @@
package example package example
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/example" "gin_server_admin/model/example"
"github.com/flipped-aurora/gin-vue-admin/server/utils" "gin_server_admin/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )

10
api/v1/example/exa_file_upload_download.go

@ -1,11 +1,11 @@
package example package example
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request" "gin_server_admin/model/common/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/example" "gin_server_admin/model/example"
exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response" exampleRes "gin_server_admin/model/example/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )

16
api/v1/examtestpage/examtype.go

@ -1,16 +1,16 @@
package examtestpage package examtestpage
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
) )
//获取集团架构参数 // 获取集团架构参数
type getGroupType struct { type getGroupType struct {
Parentid int64 `json:"parentid"` Parentid int64 `json:"parentid"`
} }
//获取集团及分厂架构 // 获取集团及分厂架构
type getGroupDepart struct { type getGroupDepart struct {
Id int64 `json:"id"` Id int64 `json:"id"`
IdStr string `json:"idstr"` IdStr string `json:"idstr"`
@ -18,7 +18,7 @@ type getGroupDepart struct {
All int `json:"all"` All int `json:"all"`
} }
//组织架构员工对照表 // 组织架构员工对照表
type groupRequest struct { type groupRequest struct {
GroupId int64 `json:"groupId"` GroupId int64 `json:"groupId"`
} }
@ -29,7 +29,7 @@ type groupUser struct {
Children []groupUser `json:"groupUser"` Children []groupUser `json:"groupUser"`
} }
//健康上报查询 // 健康上报查询
type QueryHealthReportType struct { type QueryHealthReportType struct {
commonus.PageSetLimt commonus.PageSetLimt
StartTime string `json:"starttime"` StartTime string `json:"starttime"`
@ -41,7 +41,7 @@ type OutGovCont struct {
Level int64 `json:"level" gorm:"column:level;type:int(5) unsigned;default:1;not null;comment:级别"` Level int64 `json:"level" gorm:"column:level;type:int(5) unsigned;default:1;not null;comment:级别"`
} }
//Hr系统组织架构 // Hr系统组织架构
type outGov struct { type outGov struct {
ID int64 `json:"id"` ID int64 `json:"id"`
Name string `json:"name"` Name string `json:"name"`
@ -64,7 +64,7 @@ type govThree struct {
Child []govThree `json:"children"` Child []govThree `json:"children"`
} }
//部门数组 // 部门数组
type govDepart struct { type govDepart struct {
ID int64 `json:"id"` ID int64 `json:"id"`
Name string `json:"name"` Name string `json:"name"`

60
api/v1/examtestpage/grouphandle.go

@ -7,21 +7,21 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/flipped-aurora/gin-vue-admin/server/model/testpage" "gin_server_admin/model/testpage"
"github.com/flipped-aurora/gin-vue-admin/server/model/wechat" "gin_server_admin/model/wechat"
"github.com/flipped-aurora/gin-vue-admin/server/utils/redishandel" "gin_server_admin/utils/redishandel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gorm.io/gorm" "gorm.io/gorm"
) )
//集团分厂管理模块 // 集团分厂管理模块
type GroupHandleApi struct{} type GroupHandleApi struct{}
//集团栏目 // 集团栏目
type GroupMap struct { type GroupMap struct {
Id int64 `json:"id" gorm:"column:g_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"` Id int64 `json:"id" gorm:"column:g_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"`
Name string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"` //'组织名称', Name string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"` //'组织名称',
@ -46,13 +46,13 @@ type TableData struct {
ErgodicID string `json:"ergodicid"` ErgodicID string `json:"ergodicid"`
} }
//POST提交参数 // POST提交参数
type postGroupCanshu struct { type postGroupCanshu struct {
Id int64 `json:"id" from:"id"` Id int64 `json:"id" from:"id"`
TypeId int `json:"typeid" from:"typeid"` TypeId int `json:"typeid" from:"typeid"`
} }
//集团列表 // 集团列表
func (g *GroupHandleApi) GroupList(c *gin.Context) { func (g *GroupHandleApi) GroupList(c *gin.Context) {
var groupStruct []wechat.GroupForm //集团表结构 var groupStruct []wechat.GroupForm //集团表结构
gormDb := global.GVA_DB_WatchDate.Model(&groupStruct) gormDb := global.GVA_DB_WatchDate.Model(&groupStruct)
@ -176,7 +176,8 @@ func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) {
response.Result(0, groupStruct, "获取成功", c) response.Result(0, groupStruct, "获取成功", c)
} }
/*获取子公司信息 /*
获取子公司信息
@id 子公司ID @id 子公司ID
*/ */
func (g *GroupHandleApi) GetSubsidiaryInfo(c *gin.Context) { func (g *GroupHandleApi) GetSubsidiaryInfo(c *gin.Context) {
@ -196,7 +197,8 @@ func (g *GroupHandleApi) GetSubsidiaryInfo(c *gin.Context) {
response.Result(0, subsidiaryStruct, "获取成功", c) response.Result(0, subsidiaryStruct, "获取成功", c)
} }
/*获取工段信息 /*
获取工段信息
@id 工段ID @id 工段ID
*/ */
func (g *GroupHandleApi) GetGroupPositionInfo(c *gin.Context) { func (g *GroupHandleApi) GetGroupPositionInfo(c *gin.Context) {
@ -421,12 +423,12 @@ func (g *GroupHandleApi) EiteGroupInfo(c *gin.Context) {
response.Result(0, groupStruct, "修改成功", c) response.Result(0, groupStruct, "修改成功", c)
} }
//获取单个成员信息 // 获取单个成员信息
type getOneUserSendDate struct { type getOneUserSendDate struct {
UserId string `json:"userid" from:"userid"` UserId string `json:"userid" from:"userid"`
} }
//获取成员详细信息 // 获取成员详细信息
func (g *GroupHandleApi) GetOneUserInfoAll(c *gin.Context) { func (g *GroupHandleApi) GetOneUserInfoAll(c *gin.Context) {
var groupInfo getOneUserSendDate var groupInfo getOneUserSendDate
_ = c.ShouldBindJSON(&groupInfo) //获取提交的参数 _ = c.ShouldBindJSON(&groupInfo) //获取提交的参数
@ -469,13 +471,13 @@ func (g *GroupHandleApi) GetOneUserInfoAll(c *gin.Context) {
} }
//获取单个成员信息 // 获取单个成员信息
type getDeparMentUserSendDate struct { type getDeparMentUserSendDate struct {
Id int `json:"id" from:"id"` Id int `json:"id" from:"id"`
FetchChild int `json:"fetch_child" from:"fetch_child"` FetchChild int `json:"fetch_child" from:"fetch_child"`
} }
//获取部门成员 GetDepartmentUserList // 获取部门成员 GetDepartmentUserList
func (g *GroupHandleApi) GetDepartMentUserInfoAll(c *gin.Context) { func (g *GroupHandleApi) GetDepartMentUserInfoAll(c *gin.Context) {
var groupInfo getDeparMentUserSendDate var groupInfo getDeparMentUserSendDate
_ = c.ShouldBindJSON(&groupInfo) //获取提交的参数 _ = c.ShouldBindJSON(&groupInfo) //获取提交的参数
@ -565,7 +567,7 @@ func (g *GroupHandleApi) GetDepartMentUserInfoAll(c *gin.Context) {
} }
//刷新集团成员数据库 // 刷新集团成员数据库
func (g *GroupHandleApi) RefreshDataBaseUser(c *gin.Context) { func (g *GroupHandleApi) RefreshDataBaseUser(c *gin.Context) {
var userAry []wechat.WechatUsers var userAry []wechat.WechatUsers
var weChatAry []commonus.UserListStruct var weChatAry []commonus.UserListStruct
@ -860,7 +862,7 @@ func (g *GroupHandleApi) RefreshDataBaseUser(c *gin.Context) {
} }
//获取集团和分厂架构 // 获取集团和分厂架构
func (g *GroupHandleApi) GetGroupDepartMap(c *gin.Context) { func (g *GroupHandleApi) GetGroupDepartMap(c *gin.Context) {
var requestData getGroupDepart var requestData getGroupDepart
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -912,7 +914,7 @@ func (g *GroupHandleApi) GetGroupDepartMap(c *gin.Context) {
response.Result(0, govMapThree, "获取成功", c) response.Result(0, govMapThree, "获取成功", c)
} }
//递归树 // 递归树
func GovThreeList(parentId int64, govAry []outGov) []govThree { func GovThreeList(parentId int64, govAry []outGov) []govThree {
var govMap []govThree var govMap []govThree
for _, v := range govAry { for _, v := range govAry {
@ -981,7 +983,7 @@ func GovThreeList(parentId int64, govAry []outGov) []govThree {
// response.Result(0, sendMap, "获取成功", c) // response.Result(0, sendMap, "获取成功", c)
// } // }
//获得分厂名称 // 获得分厂名称
func GetBranchFactoryMap(id int64) (isTrue bool, ContInfo []testpage.BranchFactory) { func GetBranchFactoryMap(id int64) (isTrue bool, ContInfo []testpage.BranchFactory) {
isTrue = false isTrue = false
err := global.GVA_DB_Master.Where("bf_group = ?", id).Find(&ContInfo).Error err := global.GVA_DB_Master.Where("bf_group = ?", id).Find(&ContInfo).Error
@ -1020,7 +1022,7 @@ func GetBranchFactoryMapEs(id int64, jbq int) (isTrue bool, ContInfo []bfMapJbqL
return return
} }
//获取集团架构人员信息对照表 // 获取集团架构人员信息对照表
func (g *GroupHandleApi) GetGroupUser(c *gin.Context) { func (g *GroupHandleApi) GetGroupUser(c *gin.Context) {
var requestData getGroupDepart var requestData getGroupDepart
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -1096,7 +1098,7 @@ func (g *GroupHandleApi) GetGroupUserOld(c *gin.Context) {
response.Result(0, sendMap, "获取成功", c) response.Result(0, sendMap, "获取成功", c)
} }
//获取分厂与对应员工 // 获取分厂与对应员工
func GetDepartMap(printId int64) (isTrue bool, departMap []groupUser) { func GetDepartMap(printId int64) (isTrue bool, departMap []groupUser) {
isTrue = false isTrue = false
var branchFactory []testpage.BranchFactory var branchFactory []testpage.BranchFactory
@ -1118,7 +1120,7 @@ func GetDepartMap(printId int64) (isTrue bool, departMap []groupUser) {
return return
} }
//获取分厂人员列表 // 获取分厂人员列表
func GetBranchFactoryUser(printId int64) (isTrue bool, departMap []groupUser) { func GetBranchFactoryUser(printId int64) (isTrue bool, departMap []groupUser) {
isTrue = false isTrue = false
var userInfo []testpage.PersonalDetails var userInfo []testpage.PersonalDetails
@ -1142,7 +1144,7 @@ type departSelect struct {
Id string `json:"id"` Id string `json:"id"`
} }
//获取分厂列表 // 获取分厂列表
func (g *GroupHandleApi) GetDepartmentListOld(c *gin.Context) { func (g *GroupHandleApi) GetDepartmentListOld(c *gin.Context) {
var requestData commonus.SetIds var requestData commonus.SetIds
err := c.ShouldBindJSON(&requestData) err := c.ShouldBindJSON(&requestData)
@ -1169,7 +1171,7 @@ func (g *GroupHandleApi) GetDepartmentListOld(c *gin.Context) {
response.Result(0, bfList, "数据获取成功!", c) response.Result(0, bfList, "数据获取成功!", c)
} }
//获取分厂列表 // 获取分厂列表
func (g *GroupHandleApi) GetDepartmentList(c *gin.Context) { func (g *GroupHandleApi) GetDepartmentList(c *gin.Context) {
var requestData getGroupDepart var requestData getGroupDepart
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)
@ -1219,7 +1221,7 @@ func (g *GroupHandleApi) GetDepartmentList(c *gin.Context) {
response.Result(0, govMapThree, "获取成功", c) response.Result(0, govMapThree, "获取成功", c)
} }
//递归树 // 递归树
func GovDepartThreeList(parentId int64, govAry []govDepart) []govDepartThree { func GovDepartThreeList(parentId int64, govAry []govDepart) []govDepartThree {
var govMap []govDepartThree var govMap []govDepartThree
for _, v := range govAry { for _, v := range govAry {
@ -1233,7 +1235,7 @@ func GovDepartThreeList(parentId int64, govAry []govDepart) []govDepartThree {
return govMap return govMap
} }
//递归树 // 递归树
func GovUserThreeList(parentId int64, govAry []govUserCont) []govUserContThree { func GovUserThreeList(parentId int64, govAry []govUserCont) []govUserContThree {
// fmt.Printf("parentId---------->%v\n", parentId) // fmt.Printf("parentId---------->%v\n", parentId)
var govMap []govUserContThree var govMap []govUserContThree
@ -1248,7 +1250,7 @@ func GovUserThreeList(parentId int64, govAry []govUserCont) []govUserContThree {
return govMap return govMap
} }
//获取Hr人员信息 // 获取Hr人员信息
func getUserList(departmentId int64, level int) (userList []peopleList) { func getUserList(departmentId int64, level int) (userList []peopleList) {
var userAry []hrsystem.PersonArchives var userAry []hrsystem.PersonArchives
gormDb := global.GVA_DB_HrDataBase.Model(&hrsystem.PersonArchives{}).Select("`id`,`number`,`name`,`wechat`,`work_wechat`,`key`").Where("state = 1 AND emp_type BETWEEN 1 AND 10 ") gormDb := global.GVA_DB_HrDataBase.Model(&hrsystem.PersonArchives{}).Select("`id`,`number`,`name`,`wechat`,`work_wechat`,`key`").Where("state = 1 AND emp_type BETWEEN 1 AND 10 ")

38
api/v1/examtestpage/healthreportstat.go

@ -8,15 +8,15 @@ import (
"sync" "sync"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/locationing" "gin_server_admin/model/locationing"
"github.com/flipped-aurora/gin-vue-admin/server/utils/redishandel" "gin_server_admin/utils/redishandel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//健康上报 // 健康上报
type HealthReportStat struct{} type HealthReportStat struct{}
func (h *HealthReportStat) HealthList(c *gin.Context) { func (h *HealthReportStat) HealthList(c *gin.Context) {
@ -45,7 +45,7 @@ func (h *HealthReportStat) HealthList(c *gin.Context) {
response.Result(200, healthReportInfo, msg, c) response.Result(200, healthReportInfo, msg, c)
} }
//获取企业当前正在运行的上报任务ID列表 // 获取企业当前正在运行的上报任务ID列表
func (h *HealthReportStat) RunHealthList(c *gin.Context) { func (h *HealthReportStat) RunHealthList(c *gin.Context) {
var healthReport commonus.GetHealthReportRun var healthReport commonus.GetHealthReportRun
err := c.ShouldBindJSON(&healthReport) err := c.ShouldBindJSON(&healthReport)
@ -70,7 +70,7 @@ func (h *HealthReportStat) RunHealthList(c *gin.Context) {
response.Result(0, jobMap, msg, c) response.Result(0, jobMap, msg, c)
} }
//获取健康上报任务详情 // 获取健康上报任务详情
func (h *HealthReportStat) PostReportJobInfo(c *gin.Context) { func (h *HealthReportStat) PostReportJobInfo(c *gin.Context) {
var healthReportJob commonus.GetReportJobInfoDate var healthReportJob commonus.GetReportJobInfoDate
err := c.ShouldBindJSON(&healthReportJob) err := c.ShouldBindJSON(&healthReportJob)
@ -94,7 +94,7 @@ func (h *HealthReportStat) PostReportJobInfo(c *gin.Context) {
response.Result(0, strucr.JobInfo, msg, c) response.Result(0, strucr.JobInfo, msg, c)
} }
//获取用户填写答案列表 // 获取用户填写答案列表
func (h *HealthReportStat) PostReportAnswerList(c *gin.Context) { func (h *HealthReportStat) PostReportAnswerList(c *gin.Context) {
var reportAnswer commonus.ReportAnswerStruct var reportAnswer commonus.ReportAnswerStruct
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -171,7 +171,7 @@ func (h *HealthReportStat) PostReportAnswerList(c *gin.Context) {
//获取用户填写答案列表 (全部) //获取用户填写答案列表 (全部)
//用户填写 // 用户填写
var myStatisWg = sync.WaitGroup{} var myStatisWg = sync.WaitGroup{}
type dataLockStatistics struct { type dataLockStatistics struct {
@ -180,7 +180,7 @@ type dataLockStatistics struct {
mutext sync.RWMutex mutext sync.RWMutex
} }
//读取锁数据 // 读取锁数据
func (d *dataLockStatistics) readMyDayData() ([]map[string]interface{}, []map[string]interface{}) { func (d *dataLockStatistics) readMyDayData() ([]map[string]interface{}, []map[string]interface{}) {
d.mutext.RLock() d.mutext.RLock()
defer d.mutext.RUnlock() defer d.mutext.RUnlock()
@ -277,7 +277,7 @@ func CalculationNotReport(time string, decisionTime int64, reportedPeople []map[
fmt.Printf("%v==================>%v", userDateCount, userCurlCount) fmt.Printf("%v==================>%v", userDateCount, userCurlCount)
} }
//向相关人员发送警报 https://docu.hxgk.group/images/2021_11/205c2d8d35491880a1ac9f03d6e879d3.jpg // 向相关人员发送警报 https://docu.hxgk.group/images/2021_11/205c2d8d35491880a1ac9f03d6e879d3.jpg
func sendMessAgeAlarm(calCulTime int64, alarmUser []map[string]interface{}) (sendBakc map[string]interface{}) { func sendMessAgeAlarm(calCulTime int64, alarmUser []map[string]interface{}) (sendBakc map[string]interface{}) {
// fmt.Printf("%v\n", reflect.TypeOf(alarmUser)) // fmt.Printf("%v\n", reflect.TypeOf(alarmUser))
var sendText string var sendText string
@ -361,7 +361,7 @@ func sendMessAgeAlarm(calCulTime int64, alarmUser []map[string]interface{}) (sen
// fmt.Printf("%v---------------------->%v\n", sendText, sendText) // fmt.Printf("%v---------------------->%v\n", sendText, sendText)
} }
//获取上报地址异常的数据人员信息 // 获取上报地址异常的数据人员信息
func (d *dataLockStatistics) getUserAnswerList(jobid, tadayTime, calCulTime string, page int, pageSize int64, legalAreaList []locationing.LegalArea, regionalRiskLevel []commonus.RegionalRiskLevel, isRiskYes bool) { func (d *dataLockStatistics) getUserAnswerList(jobid, tadayTime, calCulTime string, page int, pageSize int64, legalAreaList []locationing.LegalArea, regionalRiskLevel []commonus.RegionalRiskLevel, isRiskYes bool) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()
@ -564,7 +564,7 @@ func (d *dataLockStatistics) getUserAnswerList(jobid, tadayTime, calCulTime stri
myStatisWg.Done() myStatisWg.Done()
} }
//添加报警信息通知人 // 添加报警信息通知人
func (h *HealthReportStat) NoticeUserList(c *gin.Context) { func (h *HealthReportStat) NoticeUserList(c *gin.Context) {
// var reportAnswer commonus.GetHealthReportRun // var reportAnswer commonus.GetHealthReportRun
// err := c.ShouldBindJSON(&reportAnswer) // err := c.ShouldBindJSON(&reportAnswer)
@ -581,7 +581,7 @@ func (h *HealthReportStat) NoticeUserList(c *gin.Context) {
response.Result(0, noticeUserStruct, "获取到数据成功!", c) response.Result(0, noticeUserStruct, "获取到数据成功!", c)
} }
//添加报警人信息 // 添加报警人信息
func (h *HealthReportStat) AddNoticeUser(c *gin.Context) { func (h *HealthReportStat) AddNoticeUser(c *gin.Context) {
var reportAnswer locationing.NoticeUser var reportAnswer locationing.NoticeUser
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -613,7 +613,7 @@ func (h *HealthReportStat) AddNoticeUser(c *gin.Context) {
response.Result(0, reportAnswer, "写入数据成功!", c) response.Result(0, reportAnswer, "写入数据成功!", c)
} }
//修改报警人信息 // 修改报警人信息
func (h *HealthReportStat) EiteNoticeUser(c *gin.Context) { func (h *HealthReportStat) EiteNoticeUser(c *gin.Context) {
var reportAnswer locationing.NoticeUser var reportAnswer locationing.NoticeUser
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -650,7 +650,7 @@ func (h *HealthReportStat) EiteNoticeUser(c *gin.Context) {
response.Result(0, reportAnswer, "写入数据成功!", c) response.Result(0, reportAnswer, "写入数据成功!", c)
} }
//删除报警人信息 // 删除报警人信息
func (h *HealthReportStat) DelNoticeUser(c *gin.Context) { func (h *HealthReportStat) DelNoticeUser(c *gin.Context) {
var reportAnswer locationing.NoticeUser var reportAnswer locationing.NoticeUser
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -670,7 +670,7 @@ func (h *HealthReportStat) DelNoticeUser(c *gin.Context) {
response.Result(0, reportAnswer, "删除成功!", c) response.Result(0, reportAnswer, "删除成功!", c)
} }
//根据ID查询详情 // 根据ID查询详情
func (h *HealthReportStat) LookNoticeUser(c *gin.Context) { func (h *HealthReportStat) LookNoticeUser(c *gin.Context) {
var reportAnswer locationing.NoticeUser var reportAnswer locationing.NoticeUser
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -769,7 +769,7 @@ func (h *HealthReportStat) PostReportAnswerListTodayAll(c *gin.Context) {
} }
//上报数据写入数据库 // 上报数据写入数据库
func reportDataWrittenToDatabase(saveAry []map[string]interface{}) { func reportDataWrittenToDatabase(saveAry []map[string]interface{}) {
if len(saveAry) > 0 { if len(saveAry) > 0 {
for intdx, val := range saveAry { for intdx, val := range saveAry {

30
api/v1/examtestpage/healthreportstathand.go

@ -7,16 +7,16 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/location" "gin_server_admin/model/location"
"github.com/flipped-aurora/gin-vue-admin/server/model/locationing" "gin_server_admin/model/locationing"
"github.com/flipped-aurora/gin-vue-admin/server/model/wechat" "gin_server_admin/model/wechat"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
//健康上报列表 // 健康上报列表
func (h *HealthReportStat) PostReportAnswerListLimit(c *gin.Context) { func (h *HealthReportStat) PostReportAnswerListLimit(c *gin.Context) {
var reportAnswer commonus.ReportAnswerStruct var reportAnswer commonus.ReportAnswerStruct
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -209,7 +209,7 @@ func (h *HealthReportStat) PostReportAnswerListLimit(c *gin.Context) {
} }
} }
//向相关人员发送信息 // 向相关人员发送信息
func (h *HealthReportStat) SendRelevantPersonnelMsg(c *gin.Context) { func (h *HealthReportStat) SendRelevantPersonnelMsg(c *gin.Context) {
tadayTime := commonus.GetYesterDay() //获取昨日信息 tadayTime := commonus.GetYesterDay() //获取昨日信息
calCulTime := commonus.DateToTimeStamp(tadayTime + " 12:00:00") calCulTime := commonus.DateToTimeStamp(tadayTime + " 12:00:00")
@ -246,7 +246,7 @@ func (h *HealthReportStat) SendRelevantPersonnelMsg(c *gin.Context) {
} }
} }
//返回结构体 // 返回结构体
type ReportStructExce struct { type ReportStructExce struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Name string `json:"name"` Name string `json:"name"`
@ -261,7 +261,7 @@ type ReportStructExce struct {
GroupId int64 `json:"groupid"` GroupId int64 `json:"groupid"`
} }
//上报统计 // 上报统计
func (h *HealthReportStat) ReportStatistics(c *gin.Context) { func (h *HealthReportStat) ReportStatistics(c *gin.Context) {
var reportStatistics commonus.ReportStatisticsStruct var reportStatistics commonus.ReportStatisticsStruct
err := c.ShouldBindJSON(&reportStatistics) err := c.ShouldBindJSON(&reportStatistics)
@ -376,7 +376,7 @@ func (h *HealthReportStat) ReportStatistics(c *gin.Context) {
response.Result(0, returnData, "查询成功!", c) response.Result(0, returnData, "查询成功!", c)
} }
//未上报人员 // 未上报人员
func (h *HealthReportStat) NotReportedPeople(c *gin.Context) { func (h *HealthReportStat) NotReportedPeople(c *gin.Context) {
var reportAnswer commonus.ReportAnswerStruct var reportAnswer commonus.ReportAnswerStruct
err := c.ShouldBindJSON(&reportAnswer) err := c.ShouldBindJSON(&reportAnswer)
@ -436,7 +436,7 @@ func (h *HealthReportStat) NotReportedPeople(c *gin.Context) {
response.Result(0, returnData, "未上报人员列表!", c) response.Result(0, returnData, "未上报人员列表!", c)
} }
//获取全国风险地区列表(企鹅接口 https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5) // 获取全国风险地区列表(企鹅接口 https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5)
func (h *HealthReportStat) NationalRiskArea(c *gin.Context) { func (h *HealthReportStat) NationalRiskArea(c *gin.Context) {
jsondata, isyes := commonus.GetNationalRiskArea() jsondata, isyes := commonus.GetNationalRiskArea()
@ -449,7 +449,7 @@ func (h *HealthReportStat) NationalRiskArea(c *gin.Context) {
response.Result(0, returnData, "全国风险地区列表!", c) response.Result(0, returnData, "全国风险地区列表!", c)
} }
//测试写入异常人员 // 测试写入异常人员
func (h *HealthReportStat) TestMan(c *gin.Context) { func (h *HealthReportStat) TestMan(c *gin.Context) {
var reportAnswer location.AbnormalPeople var reportAnswer location.AbnormalPeople
c.ShouldBindJSON(&reportAnswer) c.ShouldBindJSON(&reportAnswer)
@ -459,7 +459,7 @@ func (h *HealthReportStat) TestMan(c *gin.Context) {
response.Result(0, returnData, "全国风险地区列表!", c) response.Result(0, returnData, "全国风险地区列表!", c)
} }
//向相关人员发送信息 // 向相关人员发送信息
func (h *HealthReportStat) SendRelevantPersonnelTodayMsg(c *gin.Context) { func (h *HealthReportStat) SendRelevantPersonnelTodayMsg(c *gin.Context) {
tadayTime := commonus.GetToDay() //获取昨日信息 tadayTime := commonus.GetToDay() //获取昨日信息
calCulTime := commonus.DateToTimeStamp(tadayTime + " 09:00:00") calCulTime := commonus.DateToTimeStamp(tadayTime + " 09:00:00")
@ -500,7 +500,7 @@ func (h *HealthReportStat) SendRelevantPersonnelTodayMsg(c *gin.Context) {
} }
} }
//查询 // 查询
func (h *HealthReportStat) QueryHealthReport(c *gin.Context) { func (h *HealthReportStat) QueryHealthReport(c *gin.Context) {
var requestData QueryHealthReportType var requestData QueryHealthReportType
c.ShouldBindJSON(&requestData) c.ShouldBindJSON(&requestData)

14
api/v1/fileuploaddownload/fileupdowntype.go

@ -12,11 +12,11 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
) )
//上传文件返回前端 // 上传文件返回前端
type UpLoadFileStruct struct { type UpLoadFileStruct struct {
ID int64 `json:"ID"` ID int64 `json:"ID"`
Key string `json:"key"` Key string `json:"key"`
@ -31,20 +31,20 @@ type UpLoadFileStruct struct {
Size string `json:"size"` Size string `json:"size"`
} }
//文件基本属性 // 文件基本属性
type FileAttribute struct { type FileAttribute struct {
FileName string `json:"fileName"` FileName string `json:"fileName"`
FileSize int64 `json:"fileSize"` FileSize int64 `json:"fileSize"`
FileExt string `json:"fileExt"` FileExt string `json:"fileExt"`
} }
//远程数据返回 // 远程数据返回
type CallBackFileData struct { type CallBackFileData struct {
commonus.ReturnJson commonus.ReturnJson
Data RemoteUploadDataStruct `json:data` Data RemoteUploadDataStruct `json:data`
} }
//远程上传返回 // 远程上传返回
type RemoteUploadDataStruct struct { type RemoteUploadDataStruct struct {
Callbackurl string `json:"callbackurl"` //预览地址 Callbackurl string `json:"callbackurl"` //预览地址
FilePath string `json:"filePath"` //物理地址 FilePath string `json:"filePath"` //物理地址
@ -57,7 +57,7 @@ type RemoteUploadDataStruct struct {
} }
//上传到远程服务器 // 上传到远程服务器
func postFormDataWithSingleFile(filePath string, fileType int) (CallBackFileData CallBackFileData) { func postFormDataWithSingleFile(filePath string, fileType int) (CallBackFileData CallBackFileData) {
client := http.Client{} client := http.Client{}
bodyBuf := &bytes.Buffer{} bodyBuf := &bytes.Buffer{}

6
api/v1/fileuploaddownload/fileuploaddown.go

@ -7,8 +7,8 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
@ -19,7 +19,7 @@ type urlData struct {
Sign string `json:"sign"` Sign string `json:"sign"`
} }
//上传文件(远程) // 上传文件(远程)
func (f *FileUploadDownload) LongRangeFileUpload(c *gin.Context) { func (f *FileUploadDownload) LongRangeFileUpload(c *gin.Context) {
_, fileHeader, fileErr := c.Request.FormFile("file") _, fileHeader, fileErr := c.Request.FormFile("file")
typePostForm := c.PostForm("type") typePostForm := c.PostForm("type")

4
api/v1/positionkpi/entry.go

@ -1,8 +1,8 @@
package positionkpi package positionkpi
import ( import (
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
) )
type ApiGroup struct { type ApiGroup struct {

10
api/v1/positionkpi/posttarget.go

@ -5,11 +5,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

10
api/v1/positionkpi/posttargetcont.go

@ -6,11 +6,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/commonus" "gin_server_admin/commonus"
"github.com/flipped-aurora/gin-vue-admin/server/global" "gin_server_admin/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/assessmentmodel" "gin_server_admin/model/assessmentmodel"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "gin_server_admin/model/common/response"
"github.com/flipped-aurora/gin-vue-admin/server/model/hrsystem" "gin_server_admin/model/hrsystem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save