zhengcaioa.git - Gitblit

			@@ -14,6 +14,39 @@
			is_travelsubsidy nvarchar(1) null
			go

			<<<<<<< HEAD

			alter table plt_user add

			[beizhu] [nvarchar](500) NULL
			go

			alter table plt_user add

			jibensalary decimal(10,2) null,
			baomisalary decimal(10,2) null,
			jintiesalary decimal(10,2) null

			go



			alter table plt_user add

			geshuiqizheng decimal(10,2) null

			go


			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'd3f04c50-72d8-46c8-8537-b0b5b2e66a00', N'1', N'èå·¥åºæ¬å·¥èµ', NULL, 1, N'/User/JiBenGongZi', N'01', N'M', N'6a13cb10-35d9-4176-a231-8887948e059e', NULL, 0, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-06-15T13:53:24.527' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-06-15T13:54:47.280' AS DateTime))
			go

			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'4c7fae29-974b-48e9-9519-1736af5f4d17', N'1', N'èå¡åºæ¬å·¥èµ', N'', 2, N'/HrJibengongzi/Index', N'01', N'M', N'6a13cb10-35d9-4176-a231-8887948e059e', N'', 0, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-06-17T10:38:16.583' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-06-17T10:38:16.583' AS DateTime))
			go

			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,
			@@ -46,15 +79,17 @@
			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 [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] 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('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('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())
			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());
			go


			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,
			@@ -68,12 +103,27 @@
			--çµè¯å¡åéèå
			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())
			insert into [plt_page] values('5E973843-7EB4-41A6-B49B-192208647B2C','1','çµè¯è´¹ç¨è®°å½','',4,'/SimCost/SimYear/','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
			USE [zhengcaioa]
			GO

			/**** Object: View [dbo].[v_sim_cost] Script Date: 2021/6/21 9:13:40 ****/
			SET ANSI_NULLS ON
			GO

			SET QUOTED_IDENTIFIER ON
			GO

			create view [dbo].[v_sim_cost] as
			SELECT a.id, a.sim_id, a.user_id, a.allow_amount, a.bill_amount, a.amount, a.bill_year, a.bill_month, a.accounted_time, a.status,
			a.up_time, b.goods_name AS simcard, c.user_name AS username
			FROM dbo.t_sim_cost AS a INNER JOIN
			dbo.adm_goods_manage AS b ON a.sim_id = b.Id LEFT OUTER JOIN
			dbo.plt_user AS c ON a.user_id = c.Id
			GO




			>>>>>>> a6b6b4303483395bf6ff745f5abf171552afae38