2 Commity 5f98597e8a ... 667891a729

Autor SHA1 Wiadomość Data
  databank102 667891a729 Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter.git into databank 4 lat temu
  databank102 63a12e105f 인력관리 현황 센터기준으로 변경 4 lat temu

+ 29 - 29
src/main/resources/mybatis/mapper/staffTotal/staffManager.xml

@@ -5,10 +5,10 @@
     <select id="selectStaffManagerCount" parameterType="StaffManagerDTO" resultType="int">
         <![CDATA[
             SELECT COUNT(*) AS TOTAL
-              FROM STAFF_MANAGER SM, CENTER_INFO CI
+              FROM CENTER_INFO CI, STAFF_MANAGER SM
             WHERE 1 = 1
-                AND SM.CENTER_CODE = CI.CENTER_CODE
-                AND GUBUN = #{gubun}
+                AND CI.CENTER_CODE = SM.CENTER_CODE(+)
+                AND NVL(SM.GUBUN, 'm') = #{gubun}
         ]]>
         <if test='centerCode != null and centerCode != ""'>
             <![CDATA[
@@ -27,7 +27,7 @@
         </if>
         <if test='registDay != null and registDay != ""'>
             <![CDATA[
-                AND REGIST_DAY = ( SELECT MAX(TSM.REGIST_DAY) REGIST_DAY
+                AND NVL(SM.REGIST_DAY, TO_CHAR(NOW(),'YYYY-MM-DD'))  = ( SELECT NVL(MAX(TSM.REGIST_DAY), TO_CHAR(NOW(),'YYYY-MM-DD')) REGIST_DAY
                                     FROM
                                         STAFF_MANAGER TSM
                                     WHERE
@@ -177,30 +177,30 @@
     <select id="selectStaffManagerList" parameterType="StaffManagerDTO" resultType="StaffManagerDTO">
         <![CDATA[
             SELECT
-                SM.CENTER_CODE                                             AS centerCode,
+                CI.CENTER_CODE                                             AS centerCode,
                 NVL(SM.GUBUN, #{gubun})                                    AS gubun,       --M:의료,     G:행정
-                SUM(SM.STAFF1 )                                            AS staff1,      --의사,       복지부
-                SUM(SM.STAFF2 )                                            AS staff2,      --간호사,      지자체
-                SUM(SM.STAFF3 )                                            AS staff3,      --간호조무사,   환경부
-                SUM(SM.STAFF4 )                                            AS staff4,      --임상병리사,   소방청
-                SUM(SM.STAFF5 )                                            AS staff5,      --방사선사,     기타
-                SUM(SM.STAFF6 )                                            AS staff6,      --행정인력,     국방부
-                SUM(SM.STAFF7 )                                            AS staff7,      --공보의,      경찰청
-                SUM(SM.STAFF8 )                                            AS staff8,      --군의관,      소방청
-                SUM(SM.STAFF9 )                                            AS staff9,      --간호사관생도,  방역
-                SUM(SM.STAFF10)                                            AS staff10,     --민간모집의사,  청소
-                SUM(SM.STAFF11)                                            AS staff11,     --민간모집간호사, 기타
-                SUM(SM.STAFF12)                                            AS staff12,     --민간모집간호조무사
-                SUM(SM.STAFF13)                                            AS staff13,     --민간모집임상병리사
-                SUM(SM.STAFF14)                                            AS staff14,     --민간모집방사선사
-                SUM(SM.STAFF15)                                            AS staff15,     --민간모집기타인력
+                NVL(SUM(SM.STAFF1 ),0)                                     AS staff1,      --의사,       복지부
+                NVL(SUM(SM.STAFF2 ),0)                                     AS staff2,      --간호사,      지자체
+                NVL(SUM(SM.STAFF3 ),0)                                     AS staff3,      --간호조무사,   환경부
+                NVL(SUM(SM.STAFF4 ),0)                                     AS staff4,      --임상병리사,   소방청
+                NVL(SUM(SM.STAFF5 ),0)                                     AS staff5,      --방사선사,     기타
+                NVL(SUM(SM.STAFF6 ),0)                                     AS staff6,      --행정인력,     국방부
+                NVL(SUM(SM.STAFF7 ),0)                                     AS staff7,      --공보의,      경찰청
+                NVL(SUM(SM.STAFF8 ),0)                                     AS staff8,      --군의관,      소방청
+                NVL(SUM(SM.STAFF9 ),0)                                     AS staff9,      --간호사관생도,  방역
+                NVL(SUM(SM.STAFF10),0)                                     AS staff10,     --민간모집의사,  청소
+                NVL(SUM(SM.STAFF11),0)                                     AS staff11,     --민간모집간호사, 기타
+                NVL(SUM(SM.STAFF12),0)                                     AS staff12,     --민간모집간호조무사
+                NVL(SUM(SM.STAFF13),0)                                     AS staff13,     --민간모집임상병리사
+                NVL(SUM(SM.STAFF14),0)                                     AS staff14,     --민간모집방사선사
+                NVL(SUM(SM.STAFF15),0)                                     AS staff15,     --민간모집기타인력
                 SM.CREATE_DATE                                             AS createDate,
                 SM.UPDATE_DATE                                             AS updateDate,
                 SM.CREATE_BY_ID                                            AS createById,
                 SM.UPDATE_BY_ID                                            AS updateById,
                 CI.LOCATION_CODE                                           AS locationCode,
-                DECODE(SM.CENTER_CODE, NULL , TO_CHAR(SUM(1)), CI.CENTER_NAME)                                             AS centerName,
-                DECODE(SM.CENTER_CODE, NULL , TO_CHAR(SUM(1)), (SELECT CH.COOPERATIVE_NAME 
+                DECODE(CI.CENTER_CODE, NULL , TO_CHAR(SUM(1)), CI.CENTER_NAME)                                             AS centerName,
+                DECODE(CI.CENTER_CODE, NULL , TO_CHAR(SUM(1)), (SELECT CH.COOPERATIVE_NAME 
                                                                 FROM COOPERATIVE_HOSPITAL CH
                                                                 WHERE CI.COOPERATIVE_CODE = CH.COOPERATIVE_CODE
                                                                 )
@@ -212,15 +212,15 @@
                  STAFF6 + STAFF7 + STAFF8 + STAFF9 + STAFF10 +
                  STAFF11 + STAFF12 + STAFF13 + STAFF14 + STAFF15)       AS staffTotal
             FROM
-                STAFF_MANAGER SM, CENTER_INFO CI
+                CENTER_INFO CI, STAFF_MANAGER SM
             WHERE 1 = 1
-            AND SM.CENTER_CODE = CI.CENTER_CODE
-            AND SM.GUBUN = #{gubun}
-            AND SM.REGIST_DAY = ( SELECT MAX(TSM.REGIST_DAY) REGIST_DAY
+            AND CI.CENTER_CODE = SM.CENTER_CODE(+) 
+            AND NVL(SM.GUBUN, #{gubun}) = #{gubun}
+            AND NVL(SM.REGIST_DAY, TO_CHAR(NOW(),'YYYY-MM-DD')) = ( SELECT NVL(MAX(TSM.REGIST_DAY), TO_CHAR(NOW(),'YYYY-MM-DD')) REGIST_DAY
                                     FROM
                                         STAFF_MANAGER TSM
                                     WHERE
-                                        SM.CENTER_CODE = TSM.CENTER_CODE 
+                                        CI.CENTER_CODE = TSM.CENTER_CODE 
                                     AND SM.GUBUN = TSM.GUBUN
                                     AND TSM.REGIST_DAY <= DECODE(#{registDay}, '', TO_CHAR(NOW(),'YYYY-MM-DD'), #{registDay})
                                 )
@@ -237,8 +237,8 @@
             ]]>
         </if>
         <![CDATA[
-            GROUP BY SM.CENTER_CODE WITH ROLLUP HAVING 1 = 1
-            ORDER BY NVL(SM.CENTER_CODE, 99999) DESC
+            GROUP BY CI.CENTER_CODE WITH ROLLUP HAVING 1 = 1
+            ORDER BY NVL(CI.CENTER_NAME, '0')
             LIMIT #{limit}, #{limitMax}
         ]]>
     </select>