From 92bc8bd73dc8066d36a8079dd9f6ea105474a244 Mon Sep 17 00:00:00 2001 From: hodong13 Date: Tue, 20 Oct 2020 08:15:59 +0000 Subject: [PATCH] --- Dao/DB/DB1.Scheme.txt | 2 +- Dao/DB/DB2.CommonData.txt | 30 ++++++++++++++++++++++++++++++ Dao/DB/DB3.InitailDataMenuAuth.txt | 7 +++++++ Dao/MyBatis/Maps/CM.xml | 8 ++++---- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/Dao/DB/DB1.Scheme.txt b/Dao/DB/DB1.Scheme.txt index cec3402..c2b15f1 100644 --- a/Dao/DB/DB1.Scheme.txt +++ b/Dao/DB/DB1.Scheme.txt @@ -412,7 +412,6 @@ create table cm ( ,typeedu varchar(100) null ,typegrade varchar(100) null ,typejob varchar(100) null - ,isoffabs tinyint null ,isdel tinyint not null ,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL ,primary key(cmno)); @@ -505,6 +504,7 @@ create table cmev ( ,etccutrfd tinyint not null ,cut tinyint not null ,cutrfd tinyint not null + ,isoffabs tinyint null ,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL ,primary key(cmno)); diff --git a/Dao/DB/DB2.CommonData.txt b/Dao/DB/DB2.CommonData.txt index 7b807fe..cd2e747 100644 --- a/Dao/DB/DB2.CommonData.txt +++ b/Dao/DB/DB2.CommonData.txt @@ -60,4 +60,34 @@ insert into comcode(cname, cgroup, cgroupname, isuse, corder,refcode,cdt,cno,udt ('부산','studyplace','학습장소',1,1,null,now(),1,now(),1,'127.0.0.1'), ('영천','studyplace','학습장소',1,2,null,now(),1,now(),1,'127.0.0.1'), ('진주','studyplace','학습장소',1,3,null,now(),1,now(),1,'127.0.0.1'); + +insert into comcode(cname, cgroup, cgroupname, isuse, corder,refcode,cdt,cno,udt,uno,uip) VALUES + ('설계시공기술인','typeman','기술인분류',1,1,null,now(),1,now(),1,'127.0.0.1'), + ('품질관리기술인','typeman','기술인분류',1,2,null,now(),1,now(),1,'127.0.0.1'), + ('발주청기술인','typeman','기술인분류',1,3,null,now(),1,now(),1,'127.0.0.1'), + ('건설사업관리기술인','typeman','기술인분류',1,4,null,now(),1,now(),1,'127.0.0.1'), + + ('기본교육','typeedu','교육목적',1,1,null,now(),1,now(),1,'127.0.0.1'), + ('최초교육','typeedu','교육목적',1,2,null,now(),1,now(),1,'127.0.0.1'), + ('계속교육','typeedu','교육목적',1,3,null,now(),1,now(),1,'127.0.0.1'), + ('안전관리계속교육','typeedu','교육목적',1,4,null,now(),1,now(),1,'127.0.0.1'), + ('PQ가점교육','typeedu','교육목적',1,5,null,now(),1,now(),1,'127.0.0.1'), + ('기타교육','typeedu','교육목적',1,6,null,now(),1,now(),1,'127.0.0.1'), + ('승급교육','typeedu','교육목적',1,7,null,now(),1,now(),1,'127.0.0.1'), + + ('초급','typegrade','등급',1,1,null,now(),1,now(),1,'127.0.0.1'), + ('중급','typegrade','등급',1,2,null,now(),1,now(),1,'127.0.0.1'), + ('고급','typegrade','등급',1,3,null,now(),1,now(),1,'127.0.0.1'), + ('특급','typegrade','등급',1,4,null,now(),1,now(),1,'127.0.0.1'), + + ('토목','typejob','직무분야',1,1,null,now(),1,now(),1,'127.0.0.1'), + ('건축','typejob','직무분야',1,2,null,now(),1,now(),1,'127.0.0.1'), + ('기계','typejob','직무분야',1,3,null,now(),1,now(),1,'127.0.0.1'), + ('조경','typejob','직무분야',1,4,null,now(),1,now(),1,'127.0.0.1'), + ('환경','typejob','직무분야',1,5,null,now(),1,now(),1,'127.0.0.1'), + ('광업','typejob','직무분야',1,6,null,now(),1,now(),1,'127.0.0.1'), + ('안전관리','typejob','직무분야',1,7,null,now(),1,now(),1,'127.0.0.1'), + ('도시교통','typejob','직무분야',1,8,null,now(),1,now(),1,'127.0.0.1'), + ('전기전자','typejob','직무분야',1,9,null,now(),1,now(),1,'127.0.0.1'), + ('건설지원','typejob','직무분야',1,10,null,now(),1,now(),1,'127.0.0.1'); diff --git a/Dao/DB/DB3.InitailDataMenuAuth.txt b/Dao/DB/DB3.InitailDataMenuAuth.txt index 1be51fd..1e3acef 100644 --- a/Dao/DB/DB3.InitailDataMenuAuth.txt +++ b/Dao/DB/DB3.InitailDataMenuAuth.txt @@ -243,3 +243,10 @@ INSERT INTO `menuauth` (`usertype`, `menuno`, `cdt`, `cno`, `udt`, `uno`, `uip`) /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; /*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; + + + +UPDATE menuauth SET authname='강사' WHERE usertype=11; +UPDATE menuauth SET authname='고객사관리자' WHERE usertype=81; +UPDATE menuauth SET authname='통합관리자' WHERE usertype=91; +UPDATE menuauth SET authname='일반관리자' WHERE usertype=92; \ No newline at end of file diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 0c2fa00..03eaef7 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1200,14 +1200,14 @@ order by dtype,intval,longval2 - insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,isoffabs,infee,outfee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime + insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,infee,outfee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isseq,isdel,) select #ismaster#,cgno,case when a.ismaster = 1 and #ismaster# = 0 then a.cmno else a.pcmno end,ifnull(#cname#, concat('사본_', cname)),a.kname,#tmno# ,case when #tmno# is null then null else ifnull(b.classno,0)+1 end ,t.rstime,date_format(t.retime,'%Y-%m-%d 23:59:59') retime ,t.sstime,date_format(t.setime,'%Y-%m-%d 23:59:59') setime ,t.gstime,date_format(t.getime,'%Y-%m-%d 23:59:59') getime - ,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob,a.isoffabs,infee,outfee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime + ,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob,infee,outfee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,1,isseq,0, from cm a left outer join ( @@ -1257,9 +1257,9 @@ where a.cmno=#orgcmno# and a.isonline=0; insert into cmev(cmno,attend,attendcut,attendrfd,attendcutrfd,mid,midcut,midrfd,midcutrfd,final,finalcut,finalrfd,finalcutrfd,subject,subjectcut,subjectrfd,subjectcutrfd - ,discuss,discusscut,discussrfd,discusscutrfd,etc,etccut,etcrfd,etccutrfd,cut,cutrfd,) + ,discuss,discusscut,discussrfd,discusscutrfd,etc,etccut,etcrfd,etccutrfd,cut,cutrfd,isoffabs,) select #cmno#,attend,attendcut,attendrfd,attendcutrfd,mid,midcut,midrfd,midcutrfd,final,finalcut,finalrfd,finalcutrfd,subject,subjectcut,subjectrfd,subjectcutrfd - ,discuss,discusscut,discussrfd,discusscutrfd,etc,etccut,etcrfd,etccutrfd,cut,cutrfd, + ,discuss,discusscut,discussrfd,discusscutrfd,etc,etccut,etcrfd,etccutrfd,cut,cutrfd,isoffabs, from cmev a where a.cmno=#orgcmno#;