 zhangxin
|
271afd2840
|
去掉测试代码
|
3 years ago |
|
zhangxin
|
8ded41b297
|
添加模板配置文件
|
3 years ago |
|
zhangxin
|
0bed096fc9
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log
|
3 years ago |
|
zhangxin
|
7a2634b84a
|
添加日志模块功能并调试
|
3 years ago |
 weichenglei
|
70572f1857
|
Merge pull request '插入workCalendar的同时插入workCalendarLst详情' (#116) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/116
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b71777f235
|
插入workCalendar的同时插入workCalendarLst详情
|
3 years ago |
|
zhangxin
|
d2a62222f3
|
设置workCalendarNr为自增
|
3 years ago |
|
weichenglei
|
4183cc1162
|
Merge pull request '插入weekModel同时插入weekModelLst详情' (#115) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/115
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
eedad6e908
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_base
# Conflicts:
# models/base/WeekModel.model.go
|
3 years ago |
|
zhangxin
|
71e13cf3a5
|
插入单条weekModel同时插入weekModelLst详情
|
3 years ago |
|
weichenglei
|
7aa470a902
|
Merge pull request 'feature_attrdug' (#114) from feature_attrdug into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/114
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
47d89fc637
|
Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_BACKEND into feature_attrdug
|
3 years ago |
|
weichenglei
|
f12557ae73
|
Merge pull request '调整了WeekModel.DateFrom,WeekModelLst.WorkDate,WorkCalendarLst.WorkDate的类型' (#113) from fix_DateType into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/113
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
413c90e0e0
|
属性组判断修正
|
3 years ago |
|
allanwei
|
73aeeb89ed
|
调整了WeekModel.DateFrom,WeekModelLst.WorkDate,WorkCalendarLst.WorkDate的类型
|
3 years ago |
|
zhangxin
|
3113bfe414
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log
|
3 years ago |
|
weichenglei
|
beede5e9a3
|
Merge pull request '属性，属性组数据维护' (#112) from feature_baseg into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/112
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
b1cb0a40c5
|
属性，属性组数据维护
|
3 years ago |
|
娄文智
|
1e9f842cf7
|
Merge pull request '完善时间和产线数据维护的功能和解决测试出现的bug' (#111) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/111
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
d41e1f0450
|
开启需要的接口
|
3 years ago |
|
zhangxin
|
0828a5e52b
|
开启workcalendarLst批量插入的接口功能
|
3 years ago |
|
zhangxin
|
0c9e305c27
|
开启需要的接口
|
3 years ago |
|
zhangxin
|
43ebc2a658
|
添加WorkCalendarNr字段为自增字段
|
3 years ago |
|
weichenglei
|
d65418d2da
|
Merge pull request '修改weekModelLst和workCalendarLst部分接口改为批量插入' (#110) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/110
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
4fb40746cc
|
修改weekModelLst和workCalendarLst部分接口改为批量插入
|
3 years ago |
|
weichenglei
|
4887b16e3a
|
Merge pull request '对weekModel、dayModel、workshift三个model中的自增字段做自增处理，同时对自增主键没有业务主键的插入不做主键排重处理' (#109) from fix_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/109
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
e41fe1c884
|
对weekModel、dayModel、workshift三个model中的自增字段做自增处理，同时对自增主键没有业务主键的插入不做主键排重处理
|
3 years ago |
|
weichenglei
|
721f900cb9
|
Merge pull request '修复计算时间没有写入到字段上，修复插入单条报错的bug' (#108) from fix_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/108
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
efe634d44e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_base
|
3 years ago |
|
zhangxin
|
f2618242ce
|
打开需要的接口路由
|
3 years ago |
|
zhangxin
|
edfb01f36c
|
修复计算时间没有写入到字段上，修复插入单条报错的bug
|
3 years ago |
|
weichenglei
|
416a137e65
|
Merge pull request '添加日模型和人员班组的工作时长的计算、添加calendar和workshift列表查询拼接子表数据' (#107) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/107
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
a69a1af925
|
添加日模型和人员班组的工作时长的计算、添加calendar和workshift列表查询拼接子表数据
|
3 years ago |
|
weichenglei
|
1291c72795
|
Merge pull request '添加生产线、时间模型的数据维护接口功能' (#106) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/106
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
4cb97bc178
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_base
|
3 years ago |
|
zhangxin
|
9298ec08fc
|
打开需要得接口开关
|
3 years ago |
|
zhangxin
|
34c16b1bc4
|
添加生产线、时间模型得数据维护接口开发
|
3 years ago |
|
weichenglei
|
5fb34062ce
|
Merge pull request 'me 路由更新 项目定义，Uom定义，矩阵转换' (#105) from feature_project into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/105
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
427de7ad2c
|
me 路由更新 项目定义，Uom定义，矩阵转换
|
3 years ago |
|
weichenglei
|
101fd469d9
|
Merge pull request '增加了WeekModel,ME_Project,ME_SetupMatrix的自动生成' (#104) from feature_Code into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/104
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
79146b6951
|
增加了WeekModel,ME_Project,ME_SetupMatrix的自动生成
|
3 years ago |
|
weichenglei
|
d576f080cc
|
Merge pull request '补全了Base模块自动生成代码' (#103) from feature_Base_Code into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/103
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
9992b47226
|
补全了Base模块注册路由的方法
|
3 years ago |
|
weichenglei
|
bcd1a3ea60
|
Merge pull request '维护工单展示列表页 根据用户资产和用户服务关联关系进行数据过滤' (#102) from feature_pm into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/102
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
65682ece40
|
维护工单展示列表页 根据用户资产和用户服务关联关系进行数据过滤
|
3 years ago |
|
allanwei
|
9951f209f2
|
补充了Base模块自动生成代码
|
3 years ago |
|
weichenglei
|
7320fdd975
|
Merge pull request '添加维护工单页抽屉对应新增两个接口，1. 通过assetid查询对应的维护服务 2.手动创建维护工单' (#101) from feature_pm into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/101
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
312836d8e3
|
添加维护工单页抽屉对应新增两个接口，1. 通过assetid查询对应的维护服务 2.手动创建维护工单
|
3 years ago |
|
allanwei
|
3b4072c226
|
添加了Base模块自动生成代码
|
3 years ago |
|
weichenglei
|
420970ff0a
|
Merge pull request '修复查询维护工单翻页问题bug，和修改筛选查询资产描述为资产id' (#100) from fix_pm into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/100
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
