From 0f5218bb8ed4ad8fa9b8b2f089efd624dc6e9f07 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 21 六月 2021 08:56:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
用户表更新.sql | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git "a/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql" "b/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
index 8dff297..8a26f62 100644
--- "a/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
+++ "b/\347\224\250\346\210\267\350\241\250\346\233\264\346\226\260.sql"
@@ -1,5 +1,7 @@
use zhengcaioa
go
+
+--qwj 2021.6.8
alter table plt_user add
ipmac nvarchar(30) null,
@@ -12,6 +14,7 @@
is_travelsubsidy nvarchar(1) null
go
+<<<<<<< HEAD
alter table plt_user add
@@ -43,3 +46,68 @@
INSERT [dbo].[plt_page] ([Id], [system_id], [page_name], [page_shortcut], [display_seq], [page_path], [page_method], [page_type], [page_superior], [page_ico], [open_type], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'e7e0363d-8215-433e-8c63-df902088b160', N'1', N'绩效提成标准', NULL, 3, N'/HrJixiaoticheng/Index', N'01', N'M', N'6a13cb10-35d9-4176-a231-8887948e059e', NULL, 0, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-06-17T14:53:30.890' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-06-17T14:54:01.643' AS DateTime))
go
+=======
+--qwj 2021.6.18
+create table t_sim_bind (
+ id int identity,
+ sim_id nvarchar(40) null,
+ user_id nvarchar(40) null,
+ cardpro nvarchar(5) null,
+ up_time datetime null,
+ up_user nvarchar(40) null,
+ constraint PK_T_SIM_BIND primary key (id)
+)
+go
+
+create table t_sim_cost (
+ id int identity,
+ sim_id nvarchar(40) null,
+ user_id nvarchar(40) null,
+ allow_amount decimal(10,2) null,
+ bill_amount decimal(10,2) null,
+ amount decimal(10,2) null,
+ bill_year int null,
+ bill_month int null,
+ accounted_time datetime null,
+ status nvarchar(1) null,
+ up_time datetime null,
+ sub_userid nvarchar(40) null,
+ audit_time datetime null,
+ audit_userid nvarchar(40) null,
+ constraint PK_T_SIM_COST primary key (id)
+)
+go
+
+--电话卡类型定义
+insert into [adm_goods_classify] values('d309d1af-5086-453a-b5a2-58b344dfff97','电话卡','A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'04')
+--补贴字典定义
+insert into [sys_code] values('107bc4e5-f13a-4d25-bd47-e4b1e61aed8a','t_sim_bind','cardpro','电话补贴','A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+
+insert into [sys_code_dtl]([Id],[code_sn],[code_id],[comments],[sort] ,[rec_status],[creater],[createtime],[modifier],[modifytime]) values('2632d933-31a3-4692-a954-df11bf223854','50','107bc4e5-f13a-4d25-bd47-e4b1e61aed8a','50',1,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+
+insert into [sys_code_dtl]([Id],[code_sn],[code_id],[comments],[sort] ,[rec_status],[creater],[createtime],[modifier],[modifytime]) values('306d666f-e93c-415c-a294-414e34cb3311','100','107bc4e5-f13a-4d25-bd47-e4b1e61aed8a','100',2,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+
+insert into [sys_code_dtl]([Id],[code_sn],[code_id],[comments],[sort] ,[rec_status],[creater],[createtime],[modifier],[modifytime]) values('61711fb1-0b96-4611-9dc0-6c69dfef656c','9999','107bc4e5-f13a-4d25-bd47-e4b1e61aed8a','不限',3,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+
+create view v_sim_bind as
+SELECT a.Id, a.goods_name AS simcard, a.goods_status AS simstatus, c.user_id AS userid, b.user_name AS username,
+ c.cardpro, c.up_time
+FROM dbo.adm_goods_manage AS a LEFT OUTER JOIN
+ dbo.t_sim_bind AS c ON a.Id = c.sim_id LEFT OUTER JOIN
+ dbo.plt_user AS b ON c.user_id = b.Id
+WHERE (a.classify_id = 'd309d1af-5086-453a-b5a2-58b344dfff97' and a.goods_status='A')
+go
+
+--电话卡分配菜单
+insert into [plt_page] values('a3479c03-d554-4e02-b201-487e8e1dfb55','1','电话卡分配','',3,'/Sim/Index/','01','M','967b0bdd-cd5d-4660-8c72-7f744c07751b','',0,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+--电话费记录明细
+insert into [plt_page] values('5E973843-7EB4-41A6-B49B-192208647B2C','1','电话费用记录','',4,'/SimCost/Index/','01','M','967b0bdd-cd5d-4660-8c72-7f744c07751b','',0,'A','e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate(),'e4c93811-b9b1-4998-89f5-c416ebab0c07',getdate())
+
+create view v_sim_cost as
+ select a.[id],[sim_id],[user_id],[allow_amount],[bill_amount],[bill_year],[bill_month],[status],[up_time]
+ ,b.goods_name,c.user_name
+ FROM [t_sim_cost] a inner join adm_goods_manage b on a.sim_id =b.Id
+ left join plt_user c on a.user_id=c.Id
+go
+
+>>>>>>> a6b6b4303483395bf6ff745f5abf171552afae38
--
Gitblit v1.9.1