caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fdf67b5dc5
								
							
						 | 
						
							
							
								
								fix: mpointstat增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-15 16:00:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dbe1635788
								
							
						 | 
						
							
							
								
								feat: mpointstat增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-15 15:56:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2c8a86d6f5
								
							
						 | 
						
							
							
								
								fix: if hour改为if hour is not None
							
							
							
							
							
						 | 
						
							2023-08-15 15:49:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fba349191c
								
							
						 | 
						
							
							
								
								feat: 作业未选证书时默认选择全部该成员全部证书
							
							
							
							
							
						 | 
						
							2023-08-10 17:12:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cdc53fd14f
								
							
						 | 
						
							
							
								
								fix: month_st计算bug
							
							
							
							
							
						 | 
						
							2023-08-09 15:07:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fef37ebcd7
								
							
						 | 
						
							
							
								
								feat: enstat list返回数据打平2
							
							
							
							
							
						 | 
						
							2023-08-09 14:20:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1ee3eb4db3
								
							
						 | 
						
							
							
								
								feat: mpintstat增加mgroup name查询条件
							
							
							
							
							
						 | 
						
							2023-08-09 13:27:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								584e5dc5c3
								
							
						 | 
						
							
							
								
								feat: enstat list返回数据打平
							
							
							
							
							
						 | 
						
							2023-08-09 13:17:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ccfeb9d901
								
							
						 | 
						
							
							
								
								feat: sflogexp合并stlog
							
							
							
							
							
						 | 
						
							2023-08-08 14:41:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f4e3d43034
								
							
						 | 
						
							
							
								
								fix: 增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-08 11:01:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c43474dace
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2023-08-07 16:00:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								959e3e3d8d
								
							
						 | 
						
							
							
								
								feat: enstat增加start_time和end_time的查询条件
							
							
							
							
							
						 | 
						
							2023-08-07 16:00:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d26a7d5805
								
							
						 | 
						
							
							
								
								fix: update_dict bug
							
							
							
							
							
						 | 
						
							2023-08-04 18:24:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f42d8386e
								
							
						 | 
						
							
							
								
								feat: eval_formula测试通过
							
							
							
							
							
						 | 
						
							2023-08-04 16:57:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5cfb12113e
								
							
						 | 
						
							
							
								
								fix: mpointserializer validate 时不做mgroup绑定allocate处理2
							
							
							
							
							
						 | 
						
							2023-08-04 16:14:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4157fd95a8
								
							
						 | 
						
							
							
								
								fix: mpointserializer validate 时不做mgroup绑定allocate处理
							
							
							
							
							
						 | 
						
							2023-08-04 16:00:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								039876349e
								
							
						 | 
						
							
							
								
								fix: mpointserializer validate 错误
							
							
							
							
							
						 | 
						
							2023-08-04 15:34:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								866ad4d15d
								
							
						 | 
						
							
							
								
								feat: mpoint创建时校验问题
							
							
							
							
							
						 | 
						
							2023-08-04 15:17:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dcd338e5fa
								
							
						 | 
						
							
							
								
								feat: mpointstat增加返回内容
							
							
							
							
							
						 | 
						
							2023-08-04 14:53:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								448285e3a1
								
							
						 | 
						
							
							
								
								feat: 增加enstat筛选条件
							
							
							
							
							
						 | 
						
							2023-08-04 14:35:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8808a14ef2
								
							
						 | 
						
							
							
								
								fix: translate_eval_formula bug
							
							
							
							
							
						 | 
						
							2023-08-04 14:34:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								50a34a44bb
								
							
						 | 
						
							
							
								
								feat: 只更新必要的字段
							
							
							
							
							
						 | 
						
							2023-08-04 14:29:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebe6ab9f3b
								
							
						 | 
						
							
							
								
								feat: 增加生产异常动态记录表
							
							
							
							
							
						 | 
						
							2023-08-04 14:26:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4e5adc6dc3
								
							
						 | 
						
							
							
								
								feat: 获取工段全年目标
							
							
							
							
							
						 | 
						
							2023-08-04 14:26:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2be3c43bef
								
							
						 | 
						
							
							
								
								feat: 添加enstat2路由
							
							
							
							
							
						 | 
						
							2023-08-04 14:25:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								16971d9742
								
							
						 | 
						
							
							
								
								feat: 返回时携带ep_monitored_name
							
							
							
							
							
						 | 
						
							2023-08-04 09:55:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								959fc60e24
								
							
						 | 
						
							
							
								
								feat: 获取工段全年目标值
							
							
							
							
							
						 | 
						
							2023-08-04 09:24:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c7b7d9cec4
								
							
						 | 
						
							
							
								
								fix: cal_enstat_when_pcoal_heat_change的qs获取bug
							
							
							
							
							
						 | 
						
							2023-08-03 14:09:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7fd10f3e51
								
							
						 | 
						
							
							
								
								fix: pcoal_coal_consume可能为None
							
							
							
							
							
						 | 
						
							2023-08-03 13:58:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb60fe2728
								
							
						 | 
						
							
							
								
								feat: 其他成本数据忘记保存
							
							
							
							
							
						 | 
						
							2023-08-03 13:33:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac0908dc11
								
							
						 | 
						
							
							
								
								fix: month_st时equip_data计算失误
							
							
							
							
							
						 | 
						
							2023-08-03 11:16:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								60ac9e6ac2
								
							
						 | 
						
							
							
								
								fix: except ZeroDivisionError
							
							
							
							
							
						 | 
						
							2023-08-03 10:37:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a609b1db94
								
							
						 | 
						
							
							
								
								feat: cal_enstat_when_team_change
							
							
							
							
							
						 | 
						
							2023-08-03 10:31:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8ab973749d
								
							
						 | 
						
							
							
								
								feat: goal增加查询条件
							
							
							
							
							
						 | 
						
							2023-08-02 17:42:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67d04a9a41
								
							
						 | 
						
							
							
								
								feat: 可以不用间隔运行get_total_hour_now
							
							
							
							
							
						 | 
						
							2023-08-02 17:25:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								40ecd52fee
								
							
						 | 
						
							
							
								
								feat: 可根据时间段生成排版记录
							
							
							
							
							
						 | 
						
							2023-08-02 15:54:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e1e8d76ecf
								
							
						 | 
						
							
							
								
								fix: formula 允许为空
							
							
							
							
							
						 | 
						
							2023-08-02 15:20:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d1d427927e
								
							
						 | 
						
							
							
								
								feat: 暂时先同步执行,后面再优化
							
							
							
							
							
						 | 
						
							2023-08-02 15:09:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								25e49601a5
								
							
						 | 
						
							
							
								
								fix: task_chain group
							
							
							
							
							
						 | 
						
							2023-08-02 14:38:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5c3af36441
								
							
						 | 
						
							
							
								
								fix: 未注册为task
							
							
							
							
							
						 | 
						
							2023-08-02 14:28:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7619e5156c
								
							
						 | 
						
							
							
								
								feat: cal_mpointstats分组执行
							
							
							
							
							
						 | 
						
							2023-08-02 14:12:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad2f903c89
								
							
						 | 
						
							
							
								
								fix: init_test bug
							
							
							
							
							
						 | 
						
							2023-08-02 10:51:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6fa1d379d3
								
							
						 | 
						
							
							
								
								feat: priceset feeset change触发enstat重新计算
							
							
							
							
							
						 | 
						
							2023-08-02 10:23:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3dc647272a
								
							
						 | 
						
							
							
								
								feat: cal_enstat_when_pcoal_val_change 未完成
							
							
							
							
							
						 | 
						
							2023-08-02 10:22:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5402f2181c
								
							
						 | 
						
							
							
								
								feat: 增加enstat 统计数据,优化task执行
							
							
							
							
							
						 | 
						
							2023-08-02 10:22:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab581f2851
								
							
						 | 
						
							
							
								
								fix: after_bulk_update执行后不用return
							
							
							
							
							
						 | 
						
							2023-08-02 10:19:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								251e373d5b
								
							
						 | 
						
							
							
								
								feat: get_total_hour_now 修改
							
							
							
							
							
						 | 
						
							2023-08-01 16:41:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								80b61c9f8b
								
							
						 | 
						
							
							
								
								fix: get_total_hour_now bug
							
							
							
							
							
						 | 
						
							2023-08-01 08:54:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d2e4439b73
								
							
						 | 
						
							
							
								
								fix: get_total_hour_now bug
							
							
							
							
							
						 | 
						
							2023-08-01 08:50:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a29ed1edc8
								
							
						 | 
						
							
							
								
								fix: get_total_hour_now sql查询bug
							
							
							
							
							
						 | 
						
							2023-07-31 17:46:56 +08:00 |