<기능개선>

통합테스트목록 . 589

BO/Controllers/croomController.cs

@@ -685,10 +685,20 @@ namespace NP.BO.Controllers
                     if (vm.isexceldown == 1)
                     {
                         return ExportExcel(
-                                new String[] { "No", "운영기수", "구분", "고객사", "교육장", "과정명", "교육생", "ID", "핸드폰", "교육시작일", "교육종료일", "진도율", "진행평가", "최종평가", "과제", "환산점수", "집합교육출석여부", "강의평가", "수료여부"},
+                                new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분"
-                                new String[] { "rno", "sseqname", "isrebatename", "asname", "studyplacename", "cname", "username", "userid", "mobile", "sdatestr", "edatestr", "attrate", "ex0point", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point", "iscompletename" },
+                                    , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "과정명","수료번호","교육이수시간"
+                                    , "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가"
+                                    ,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처"
+                                    ,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회"
+                                    ,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"},
+                                new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind"
+                                    , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "cname","completeno","studytime"
+                                    , "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point"
+                                    ,"asname","addr","brno","eino","btype","bkind","ceoname","slevel","uduty","mname","mphone"
+                                    ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association"
+                                    ,"pcgname","cgname","studyplacename","tyear", "iscompletename" },
                                 vm.Lects,
-                                "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);
+                                "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day,null,",4");
                     }
                     vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault());
                     break;

Dao/MyBatis/Maps/Grade.xml

@@ -244,14 +244,23 @@
         <select id="grade.lectgrades" parameterClass="hashtable" resultClass="lect">
           select a.*
           from (
-            select a.lectno,b.userno
+            select a.lectno,b.userno,b.payno
                 ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">c.cname,c.cmno,u.username</isNull> ) rno
                 ,count(a.lectno) over() pagetotalcount
-                ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime,b.sdate,b.edate
+                ,b.isrebate
+                ,case when ppl.asname is not null then ppl.asname else ua.asname end asname
+                ,ppl.brno,ppl.ceoname,ppl.post,ppl.address1,ppl.address2,ppl.btype,ppl.bkind,ppl.eino,ppl.mname,ppl.association
+                ,CAST(AES_DECRYPT(UNHEX(ppl.mphone), <include refid="sql.digest"></include>) AS char) mphone
+                ,CAST(AES_DECRYPT(UNHEX(ppl.taxemail), <include refid="sql.digest"></include>) AS char) taxemail
+                ,u.username,u.userid,u.slevel,u.uduty
+                ,b.iscomplete,b.completetime,b.completeno,b.sdate,b.edate
+                ,concat(substring(CAST(AES_DECRYPT(UNHEX(u.userpno),<include refid="sql.digest"></include>) as char),1,6),'-',substring(CAST(AES_DECRYPT(UNHEX(u.userpno),<include refid="sql.digest"></include>) as char),7,7)) userpno
                 ,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) mobile
                 ,b.cmisno
-                ,p.payoktime
+                ,p.payoktime,p.payamt
-                ,c.cshape,c.sstime,c.cmno,c.cname,c.classno
+                ,c.cshape,c.sstime,c.cmno,c.cname,c.classno,c.studytime
+                ,t.tyear
+                ,cg.cgname,cg.pcgno,pcg.cgname as pcgname
                 ,d.isoffabs
                 ,b.attrate
                 ,a.apoint
@@ -264,7 +273,11 @@
                 ,e.sseq,e.estart,e.eend,e.studyplace
                 ,f.istatus
                 ,cc.cname studyplacename
+                ,tm.cname typemanname, te.cname typeeduname
+                ,tg.cname typegradename, tj.cname typejobname
                 ,date_format((case when c.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') edatestring
+                ,pi.tbankuser rbankuser,pi.rbank,pi.pino,pi.rbankamt
+                ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum  
             from (
                 <include refid="grade.query"></include>
             ) a
@@ -275,9 +288,18 @@
             inner join cm c on c.cmno=b.cmno
             inner join cm c2 on c2.cmno=c.pcmno
             inner join cmev d on d.cmno=c.cmno
+            left outer join term t on t.tmno = c.tmno
+            left outer join cg cg on cg.cgno = c.cgno
+            left outer join cg pcg on pcg.cgno = cg.pcgno
+            left outer join payitem pi on pi.payno = p.payno
             left outer join cminningscd e on e.cmisno = b.cmisno
             left outer join lectinning f on f.lectno = b.lectno and f.cmino = e.cmino
             left outer join comcode cc on cc.ccode = e.studyplace and cc.isuse=1
+            left outer join pplog ppl on ppl.pplno = p.pplno
+            left outer join comcode tm on tm.ccode = ppl.typeman
+            left outer join comcode te on te.ccode = ppl.typeedu
+            left outer join comcode tg on tg.ccode = ppl.typegrade
+            left outer join comcode tj on tj.ccode = ppl.typejob
             <dynamic prepend="where">
               <isNotNull property="cshape" prepend="and">c.cshape = #cshape#</isNotNull>
               <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>

Model/CM.cs

@@ -1108,7 +1108,7 @@ namespace NP.Model
         {
             get
             {
-                return  cshape == 0 && isrebate == 0 ? payoktime.ToShortDateString() : sdate != null ? Convert.ToDateTime(sdate).ToShortDateString() : null;
+                return cshape == 0 && isrebate == 0 ? payoktime.ToShortDateString() : sdate != null ? Convert.ToDateTime(sdate).ToShortDateString() : null;
             }
         }
         public DateTime? edate { get; set; }
@@ -1245,6 +1245,13 @@ namespace NP.Model
         /// 교육목적
         /// </summary>
         public String typeeduname { get; set; }
+        public String edukind
+        {
+            get
+            {
+                return typeeduname == null ? "" : typeeduname.Contains("기본교육") ? "기본" : "전문";
+            }
+        }
         /// <summary>
         /// 직무분야
         /// </summary>
@@ -1305,7 +1312,7 @@ namespace NP.Model
         {
             get
             {
-                return istatus == null ? "미입력" : istatus == 2 ? "출석" : istatus ==  0 ? "결석" : "입실";
+                return istatus == null ? "미입력" : istatus == 2 ? "출석" : istatus == 0 ? "결석" : "입실";
             }
         }
         public int? scdtype { get; set; }
@@ -1362,6 +1369,33 @@ namespace NP.Model
 
         public int? cmino { get; set; }
         public int ischeck { get; set; }
+        public String completeno { get; set; }
+        public String post { get; set; }
+        public String address1 { get; set; }
+        public String address2 { get; set; }
+        public String addr
+        {
+            get
+            {
+                return "(" + post + ")" + address1 + " " + address2;
+            }
+        }
+        public String brno { get; set; }
+        public String bkind { get; set; }
+        public String ceoname { get; set; }
+        public String slevel { get; set; }
+        public String mname { get; set; }
+        public String mphone { get; set; }
+        public int rbankamt { get; set; }
+        public String rbankaccnum { get; set; }
+        public String rbankuser { get; set; }
+        public String taxemail { get; set; }
+        public String association { get; set; }
+        public String pcgname { get; set; }
+        public String rbank { get; set; }
+        public String btype { get; set; }
+        public String eino { get; set; }
+        public String userpno { get; set;  }
     }
     /// <summary>
     /// 자격검정시험