postgresql 이식 작업중.
parent
7b660355f9
commit
fe45ea49b9
21
pom.xml
21
pom.xml
|
|
@ -158,15 +158,22 @@
|
|||
|
||||
|
||||
<!-- database driver -->
|
||||
<dependency>
|
||||
<groupId>ojdbc</groupId>
|
||||
<artifactId>ojdbc</artifactId>
|
||||
<version>14</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/ojdbc-14.jar</systemPath>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>ojdbc</groupId>-->
|
||||
<!-- <artifactId>ojdbc</artifactId>-->
|
||||
<!-- <version>14</version>-->
|
||||
<!-- <scope>system</scope>-->
|
||||
<!-- <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/ojdbc-14.jar</systemPath>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- /database driver -->
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>42.3.3</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
|
|
|
|||
|
|
@ -99,8 +99,8 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler {
|
|||
String head = null;
|
||||
String section = null;
|
||||
if (rptApprove != null) {
|
||||
head = (String) rptApprove.get("HEAD");
|
||||
section = (String) rptApprove.get("SECTION");
|
||||
head = (String) rptApprove.get("head");
|
||||
section = (String) rptApprove.get("section");
|
||||
}
|
||||
/* 계장? */
|
||||
user.setAuthHead(head != null && head.equals(userId) ? 1 : 0);
|
||||
|
|
@ -113,10 +113,10 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler {
|
|||
int authCode = 0;
|
||||
if (rptAu != null) {
|
||||
|
||||
if (rptAu.get("CODE") == null) {
|
||||
if (rptAu.get("code") == null) {
|
||||
authCode = 32;
|
||||
} else {
|
||||
authCode = Integer.parseInt(rptAu.get("CODE").toString());
|
||||
authCode = Integer.parseInt(rptAu.get("code").toString());
|
||||
}
|
||||
}
|
||||
user.setAuthCode(authCode);
|
||||
|
|
@ -170,8 +170,8 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler {
|
|||
/* 관리자? */
|
||||
int roleLev = user.getRolelevel();
|
||||
user.setAuthAdmin((roleLev <= propertiesService.getInt("adminLevel")) ? 1 : 0);
|
||||
user.setIsAdmin((roleLev <= propertiesService.getInt("adminLevel")) ? true : false);
|
||||
user.setIsSysAdmin((roleLev <= propertiesService.getInt("sysAdminLevel")) || propertiesService.getString("sysAdminId").equals(userId) ? true : false);
|
||||
user.setIsAdmin(roleLev <= propertiesService.getInt("adminLevel"));
|
||||
user.setIsSysAdmin((roleLev <= propertiesService.getInt("sysAdminLevel")) || propertiesService.getString("sysAdminId").equals(userId));
|
||||
|
||||
/* 로그인 실패횟수 초기화 */
|
||||
MemberVO memberVO = new MemberVO();
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import kcg.faics.member.vo.MemberVO;
|
|||
import kcg.faics.sec.LoginUserVO;
|
||||
import kcg.faics.sec.role.SecurityRolesVO;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.security.access.ConfigAttribute;
|
||||
import org.springframework.security.access.SecurityConfig;
|
||||
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
|
||||
|
|
@ -33,7 +34,6 @@ import egovframework.rte.psl.dataaccess.EgovAbstractMapper;
|
|||
@Repository("securityMapper")
|
||||
public class SecurityMapper extends EgovAbstractMapper {
|
||||
|
||||
|
||||
/**
|
||||
* 외사경찰 사용자 정보를 가져온다.
|
||||
*
|
||||
|
|
@ -85,16 +85,17 @@ public class SecurityMapper extends EgovAbstractMapper {
|
|||
public String getHierarchyRoles() {
|
||||
List<Map<String, Object>> resultList = selectList("Security.getHierarchyRoles");
|
||||
Iterator<Map<String, Object>> itr = resultList.iterator();
|
||||
StringBuffer concatedRoles = new StringBuffer();
|
||||
Map<String, Object> tempMap;
|
||||
while (itr.hasNext()) {
|
||||
tempMap = itr.next();
|
||||
concatedRoles.append(tempMap.get("CHILD"));
|
||||
concatedRoles.append(" > ");
|
||||
concatedRoles.append(tempMap.get("PARENT"));
|
||||
concatedRoles.append("\n");
|
||||
}
|
||||
return concatedRoles.toString();
|
||||
|
||||
StringBuilder concatedRoles = new StringBuilder();
|
||||
Map<String, Object> tempMap;
|
||||
while (itr.hasNext()) {
|
||||
tempMap = itr.next();
|
||||
concatedRoles.append(tempMap.get("child"));
|
||||
concatedRoles.append(" > ");
|
||||
concatedRoles.append(tempMap.get("parent"));
|
||||
concatedRoles.append("\n");
|
||||
}
|
||||
return concatedRoles.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -140,7 +141,8 @@ public class SecurityMapper extends EgovAbstractMapper {
|
|||
* SecuredObjectDAO, SecuredObjectServiceImpl을 참조해서 변경한다.
|
||||
* */
|
||||
boolean isResourcesUrl = true;
|
||||
String resourceType = "URL";
|
||||
|
||||
String resourceType ="url";
|
||||
|
||||
LinkedHashMap<Object, List<ConfigAttribute>> resourcesMap = new LinkedHashMap<Object, List<ConfigAttribute>>();
|
||||
Iterator<Map<String, Object>> itr = list.iterator();
|
||||
|
|
@ -175,7 +177,7 @@ public class SecurityMapper extends EgovAbstractMapper {
|
|||
}
|
||||
}
|
||||
|
||||
configList.add(new SecurityConfig((String) tempMap.get("AUTHORITY")));
|
||||
configList.add(new SecurityConfig((String) tempMap.get("authority")));
|
||||
|
||||
resourcesMap.put(presentResource, configList);
|
||||
|
||||
|
|
@ -196,7 +198,7 @@ public class SecurityMapper extends EgovAbstractMapper {
|
|||
/**
|
||||
* 차단 정보를 업데이트한다.
|
||||
*
|
||||
* @param loginUserVO 로그인 사용자 객체
|
||||
* @param memberVO 로그인 사용자 객체
|
||||
* @return 성공 - 1, 실패 - 0
|
||||
*/
|
||||
public int updateChkInfo(MemberVO memberVO) {
|
||||
|
|
|
|||
|
|
@ -22,12 +22,15 @@
|
|||
|
||||
|
||||
#TEST DB Server
|
||||
Global.datasource.driverClassName=oracle.jdbc.driver.OracleDriver
|
||||
Global.datasource.url=jdbc:oracle:thin:@106.247.244.146:51521:faics
|
||||
Global.datasource.username=new_faics
|
||||
Global.datasource.password=tkdlqjdhltk12#$
|
||||
|
||||
#Global.datasource.driverClassName=oracle.jdbc.driver.OracleDriver
|
||||
#Global.datasource.url=jdbc:oracle:thin:@106.247.244.146:51521:faics
|
||||
#Global.datasource.username=new_faics
|
||||
#Global.datasource.password=tkdlqjdhltk12#$
|
||||
|
||||
Global.datasource.driverClassName=org.postgresql.Driver
|
||||
Global.datasource.url=jdbc:postgresql://192.168.0.157:5432/faics
|
||||
Global.datasource.username=dbnt0031
|
||||
Global.datasource.password=dbnt0928!
|
||||
|
||||
|
||||
#File path
|
||||
|
|
|
|||
|
|
@ -1529,18 +1529,18 @@
|
|||
#{violateType},
|
||||
#{violateDetail},
|
||||
#{invasionType},
|
||||
NVL(#{specBatlYn}, 'N'),
|
||||
NVL(#{nllYn}, 'N'),
|
||||
COALESCE(#{specBatlYn}, 'N'),
|
||||
COALESCE(#{nllYn}, 'N'),
|
||||
#{woDetentionType},
|
||||
TO_DATE(#{fieldArrestDate}, 'YYYY-MM-DD hh24:mi'),
|
||||
TO_DATE(#{fieldReleaseDate}, 'YYYY-MM-DD hh24:mi'),
|
||||
NVL(#{leadDistance}, 0),
|
||||
NVL(#{leadHour}, 0),
|
||||
NVL(#{leadMinute}, 0),
|
||||
NVL(#{captainCount}, 0),
|
||||
NVL(#{mateCount}, 0),
|
||||
NVL(#{engineerCount}, 0),
|
||||
NVL(#{crewCount}, 0),
|
||||
COALESCE(#{leadDistance}, 0),
|
||||
COALESCE(#{leadHour}, 0),
|
||||
COALESCE(#{leadMinute}, 0),
|
||||
COALESCE(#{captainCount}, 0),
|
||||
COALESCE(#{mateCount}, 0),
|
||||
COALESCE(#{engineerCount}, 0),
|
||||
COALESCE(#{crewCount}, 0),
|
||||
#{shipProcType},
|
||||
#{commissionCost},
|
||||
#{gearCast},
|
||||
|
|
@ -1573,7 +1573,7 @@
|
|||
TO_DATE(#{marginPaymentDate}, 'YYYY-MM-DD hh24:mi'),
|
||||
#{status},
|
||||
#{delYn},
|
||||
SYSDATE,
|
||||
NOW(),
|
||||
#{regUser},
|
||||
#{regAgency}
|
||||
|
||||
|
|
@ -1666,8 +1666,8 @@
|
|||
VLTN_TYPE=#{violateType},
|
||||
VLTN_DTL=#{violateDetail},
|
||||
IVSN_TYPE=#{invasionType},
|
||||
SPEC_BATL_YN=NVL(#{specBatlYn}, 'N'),
|
||||
NLL_YN=NVL(#{nllYn}, 'N'),
|
||||
SPEC_BATL_YN=COALESCE(#{specBatlYn}, 'N'),
|
||||
NLL_YN=COALESCE(#{nllYn}, 'N'),
|
||||
AGENCY_TYPE=#{agencyType},
|
||||
AGENCY_GUARD=#{agencyGuard},
|
||||
AGENCY_VESSEL=#{agencyVessel},
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@
|
|||
) VALUES (
|
||||
#{userId}, #{category}, #{userName}, #{groupSeq},
|
||||
#{content}, #{subject}, #{parentSeq}, #{prevSeq}, #{nextSeq}, #{step},
|
||||
#{depth}, SYSDATE, ${hit}, 0, #{ip,jdbcType=VARCHAR}, #{notice},
|
||||
#{depth}, NOW(), ${hit}, 0, #{ip,jdbcType=VARCHAR}, #{notice},
|
||||
1, 0, 0, #{data1,jdbcType=VARCHAR}, #{data2,jdbcType=VARCHAR}, #{place1,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}
|
||||
)
|
||||
<selectKey resultType="int" keyProperty="seq" order="AFTER">
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
H3_BD_${id}_COMT (
|
||||
BC_SEQ, BC_NAME, BC_CONTENT, BC_REGDATE, BC_BD_SEQ, BC_IP, BC_MB_ID
|
||||
) VALUES (
|
||||
H3_BD_${id}_COMT_SEQ.NEXTVAL, #{userName}, #{content}, SYSDATE, #{parentSeq}, '10.123.141.123', #{userId}
|
||||
H3_BD_${id}_COMT_SEQ.NEXTVAL, #{userName}, #{content}, NOW(), #{parentSeq}, '10.123.141.123', #{userId}
|
||||
)
|
||||
<selectKey resultType="int" keyProperty="seq" order="AFTER">
|
||||
SELECT H3_BD_${id}_COMT_SEQ.CURRVAL FROM DUAL
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
UL_USERID, UL_NAME, UL_LOCATION1, UL_LOCATION2, UL_LOCATION3, UL_REGDATE, UL_USER_IP, UL_PLACE1, UL_POSITION
|
||||
)
|
||||
VALUES (
|
||||
#{userid}, #{name}, #{location1}, #{location2}, #{location3}, SYSDATE, #{userip, jdbcType=VARCHAR}, #{place1}, #{position}
|
||||
#{userid}, #{name}, #{location1}, #{location2}, #{location3}, NOW(), #{userip, jdbcType=VARCHAR}, #{place1}, #{position}
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
IO_USERID, IO_TYPE, IO_REGDATE, IO_PLACE1, IO_POSITION, IO_NAME
|
||||
)
|
||||
VALUES (
|
||||
#{user.userid}, #{type}, SYSDATE, #{user.place1}, #{user.position}, #{user.name}
|
||||
#{user.userid}, #{type}, NOW(), #{user.place1}, #{user.position}, #{user.name}
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
|
|||
|
|
@ -38,16 +38,16 @@
|
|||
LEVEL,
|
||||
M.ID, M.NAME, M.ENG_NAME, M.PARENT, M.DEPTH,
|
||||
M.MENU_POSITION, M.VISIBLE, M.SUB_VISIBLE, M.ROLE_LEVEL,
|
||||
NVL(M.URL_GROUP, (SELECT URL_GROUP FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_GROUP,
|
||||
NVL(M.URL, (SELECT URL FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL,
|
||||
NVL(M.URL_QUERY, (SELECT URL_QUERY FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_QUERY,
|
||||
NVL(M.BOARD_ID, (SELECT BOARD_ID FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS BOARD_ID,
|
||||
NVL(M.WINDOW_TARGET, (SELECT WINDOW_TARGET FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS WINDOW_TARGET
|
||||
COALESCE(M.URL_GROUP, (SELECT URL_GROUP FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_GROUP,
|
||||
COALESCE(M.URL, (SELECT URL FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL,
|
||||
COALESCE(M.URL_QUERY, (SELECT URL_QUERY FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS URL_QUERY,
|
||||
COALESCE(M.BOARD_ID, (SELECT BOARD_ID FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS BOARD_ID,
|
||||
COALESCE(M.WINDOW_TARGET, (SELECT WINDOW_TARGET FROM T_MENU WHERE ID = (SELECT MIN(ID) FROM T_MENU WHERE PARENT = M.ID))) AS WINDOW_TARGET
|
||||
FROM
|
||||
T_MENU M
|
||||
WHERE
|
||||
M.VISIBLE = 'Y'
|
||||
AND M.ROLE_LEVEL >= NVL((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17)
|
||||
AND M.ROLE_LEVEL >= COALESCE((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17)
|
||||
]]>
|
||||
<if test="menuPosition != null and menuPosition != ''"><![CDATA[
|
||||
AND M.MENU_POSITION = #{menuPosition}
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
WHERE
|
||||
A.VISIBLE = 'Y'
|
||||
AND A.SUB_VISIBLE = 'Y'
|
||||
AND A.ROLE_LEVEL >= NVL((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17)
|
||||
AND A.ROLE_LEVEL >= COALESCE((SELECT ROLE_LEVEL FROM T_SSO_AUTH_CODE AC, TAGENT A WHERE AC.CODE_ID = A.USEGRADE AND A.USERID = #{userId}), 17)
|
||||
ORDER BY
|
||||
A.ID
|
||||
]]>
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@
|
|||
)
|
||||
VALUES
|
||||
(
|
||||
(SELECT NVL(MAX(ES_IDX), 0) + 1 FROM H3_EDU_STAT), #{name}, #{stdate}, #{eddate}, #{eduCourse},
|
||||
(SELECT COALESCE(MAX(ES_IDX), 0) + 1 FROM H3_EDU_STAT), #{name}, #{stdate}, #{eddate}, #{eduCourse},
|
||||
#{eduPlace}, #{userId}, #{place1}, #{place2}, #{scholarship},
|
||||
#{position}, #{jobtype}, #{sdate}, #{pdate}, #{adate},
|
||||
#{comment}, SYSDATE, SYSDATE, #{writer}, #{birth}
|
||||
#{comment}, NOW(), NOW(), #{writer}, #{birth}
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
ES_PDATE = #{pdate},
|
||||
ES_ADATE = #{adate},
|
||||
ES_COMMENT = #{comment},
|
||||
ES_LOGDATE = SYSDATE,
|
||||
ES_LOGDATE = NOW(),
|
||||
ES_WRITER = #{writer},
|
||||
ES_BIRTH = #{birth}
|
||||
WHERE ES_IDX = #{idx}
|
||||
|
|
|
|||
|
|
@ -115,10 +115,10 @@
|
|||
<![CDATA[
|
||||
SELECT
|
||||
1 AS CNT, '계' AS GUBUN, '' AS CODE,
|
||||
NVL(SUM(${type}), 0) AS TOTAL,
|
||||
COALESCE(SUM(${type}), 0) AS TOTAL,
|
||||
]]>
|
||||
<foreach collection="place1" item="item" separator=",">
|
||||
NVL(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
|
||||
COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
|
||||
</foreach>
|
||||
<![CDATA[
|
||||
FROM
|
||||
|
|
@ -129,10 +129,10 @@
|
|||
UNION
|
||||
SELECT
|
||||
2 AS CNT, B.CODENM AS GUBUN, B.CODE2 AS CODE,
|
||||
NVL(SUM(${type}), 0) AS TOTAL,
|
||||
COALESCE(SUM(${type}), 0) AS TOTAL,
|
||||
]]>
|
||||
<foreach collection="place1" item="item" separator=",">
|
||||
NVL(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
|
||||
COALESCE(SUM(CASE EU_POLICE WHEN #{item.code2} THEN ${type} ELSE 0 END), 0) AS ${item.code2}
|
||||
</foreach>
|
||||
<![CDATA[
|
||||
FROM
|
||||
|
|
@ -244,7 +244,7 @@
|
|||
) VALUES (
|
||||
#{police}, #{year}, #{quater},
|
||||
#{code}, #{cnt}, #{detail},
|
||||
#{state}, #{check}, SYSDATE, #{writer}
|
||||
#{state}, #{check}, NOW(), #{writer}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
|
@ -263,7 +263,7 @@
|
|||
<select id="selectStateWaitingList" parameterType="stateWaitingSearchVO" resultMap="useStateResult">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
A.*, NVL(ESJ_SEQ, 0) AS ESJ_SEQ, ESJ_CHECKDATE,
|
||||
A.*, COALESCE(ESJ_SEQ, 0) AS ESJ_SEQ, ESJ_CHECKDATE,
|
||||
(SELECT CODENM FROM TCODE WHERE CODE1 = 'C001' AND CODE2 = A.EU_POLICE) AS POLICE_NAME
|
||||
FROM
|
||||
(SELECT EU_POLICE, EU_YEAR, EU_QUATER FROM H3_EQUIP_USE_STATE GROUP BY EU_POLICE, EU_YEAR, EU_QUATER) A
|
||||
|
|
@ -407,7 +407,7 @@ INSERT INTO TEQUIPMENT
|
|||
#{fileName1},
|
||||
#{fileName2},
|
||||
#{fileName3},
|
||||
TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS'),
|
||||
TO_CHAR(NOW(), 'YYYYMMDDHH24MISS'),
|
||||
#{writer},
|
||||
NULL
|
||||
)
|
||||
|
|
@ -442,7 +442,7 @@ INSERT INTO TEQUIPMENT
|
|||
FILENAME1 = #{fileName1},
|
||||
FILENAME2 = #{fileName2},
|
||||
FILENAME3 = #{fileName3},
|
||||
LOGDATE = TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS')
|
||||
LOGDATE = TO_CHAR(NOW(), 'YYYYMMDDHH24MISS')
|
||||
WHERE
|
||||
SERNO = #{serNo}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
( ESJ_POLICE, ESJ_YEAR, ESJ_QUATER, ESJ_CHECKDATE, ESJ_PLACE1,
|
||||
ESJ_POSITION, ESJ_NAME, ESJ_USERID, ESJ_PROXY_ID, ESJ_MESSAGE )
|
||||
VALUES
|
||||
( #{police}, #{year}, #{quater}, SYSDATE, #{place1Str},
|
||||
( #{police}, #{year}, #{quater}, NOW(), #{place1Str},
|
||||
#{positionStr}, #{name}, #{userId}, #{proxyId}, #{message} )
|
||||
]]>
|
||||
</insert>
|
||||
|
|
|
|||
|
|
@ -1851,19 +1851,19 @@
|
|||
#{violateType},
|
||||
#{violateDetail},
|
||||
#{invasionType},
|
||||
NVL(#{specBatlYn}, 'N'),
|
||||
COALESCE(#{specBatlYn}, 'N'),
|
||||
#{nllYn},
|
||||
'01',
|
||||
TO_DATE(#{fieldArrestDate}, 'YYYY-MM-DD hh24:mi'),
|
||||
TO_DATE(#{fieldReleaseDate}, 'YYYY-MM-DD hh24:mi'),
|
||||
#{leadDistance},
|
||||
NVL(#{leadHour}, 0),
|
||||
NVL(#{leadNumber}, 0),
|
||||
NVL(#{leadMinute}, 0),
|
||||
NVL(#{captainCount}, 0),
|
||||
NVL(#{mateCount}, 0),
|
||||
NVL(#{engineerCount}, 0),
|
||||
NVL(#{crewCount}, 0),
|
||||
COALESCE(#{leadHour}, 0),
|
||||
COALESCE(#{leadNumber}, 0),
|
||||
COALESCE(#{leadMinute}, 0),
|
||||
COALESCE(#{captainCount}, 0),
|
||||
COALESCE(#{mateCount}, 0),
|
||||
COALESCE(#{engineerCount}, 0),
|
||||
COALESCE(#{crewCount}, 0),
|
||||
#{shipProcType},
|
||||
#{commissionCost},
|
||||
#{gearCast},
|
||||
|
|
@ -1896,7 +1896,7 @@
|
|||
TO_DATE(#{marginPaymentDate}, 'YYYY-MM-DD hh24:mi'),
|
||||
'1',
|
||||
#{delYn},
|
||||
SYSDATE,
|
||||
NOW(),
|
||||
#{regUser},
|
||||
#{regAgency},
|
||||
#{foreignCrew},
|
||||
|
|
@ -2087,7 +2087,7 @@
|
|||
VLTN_TYPE=#{violateType},
|
||||
VLTN_DTL=#{violateDetail},
|
||||
IVSN_TYPE=#{invasionType},
|
||||
SPEC_BATL_YN=NVL(#{specBatlYn}, 'N'),
|
||||
SPEC_BATL_YN=COALESCE(#{specBatlYn}, 'N'),
|
||||
NLL_YN=#{nllYn},
|
||||
AGENCY_TYPE=#{agencyType},
|
||||
AGENCY_GUARD='PS00',
|
||||
|
|
|
|||
|
|
@ -588,9 +588,9 @@
|
|||
PLACE1 = #{place1}, PLACE2 = #{place2}, PLACE3 = #{place3},
|
||||
POSITION = #{position}, DUTIES = #{duties}, JOBTYPE = #{jobtype}, INOUT = #{inout}, SCHOLARSHIP = #{scholarship},
|
||||
EXCAREER = #{excareer}, EXCAREER1 = #{excareer1}, EXCAREER2 = #{excareer2}, EXCAREER3 = #{excareer3},
|
||||
COMMENT_ = #{comment_}, LOGINDATE = TO_CHAR(SYSDATE, 'YYYY-MM-DD'),
|
||||
COMMENT_ = #{comment_}, LOGINDATE = TO_CHAR(NOW(), 'YYYY-MM-DD'),
|
||||
CHARGE = #{charge}, EXPLACE = #{explace}, USEGRADE = #{usegrade}, USERIMG = #{userimg,jdbcType=VARCHAR}, USERSIGN = #{usersign,jdbcType=VARCHAR},
|
||||
CHKCNT = NVL(#{chkcnt}, 0)
|
||||
CHKCNT = COALESCE(#{chkcnt}, 0)
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
]]>
|
||||
|
|
@ -616,7 +616,7 @@
|
|||
</otherwise>
|
||||
</choose>
|
||||
<![CDATA[
|
||||
#{place1}, #{place2}, #{position}, TO_CHAR(SYSDATE, 'YYYYMMDD'), TO_CHAR(SYSDATE, 'YYYYMMDD'), #{writer} )
|
||||
#{place1}, #{place2}, #{position}, TO_CHAR(NOW(), 'YYYYMMDD'), TO_CHAR(NOW(), 'YYYYMMDD'), #{writer} )
|
||||
]]>
|
||||
</insert>
|
||||
|
||||
|
|
@ -634,7 +634,7 @@
|
|||
PLACE1 = #{place1},
|
||||
PLACE2 = #{place2},
|
||||
POSITION = #{position},
|
||||
CHKCNT = NVL(#{chkcnt}, 0)
|
||||
CHKCNT = COALESCE(#{chkcnt}, 0)
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
]]>
|
||||
|
|
@ -675,7 +675,7 @@
|
|||
</choose>
|
||||
<![CDATA[
|
||||
SET
|
||||
LOGINDATE = TO_CHAR(SYSDATE, 'YYYY-MM-DD'),
|
||||
LOGINDATE = TO_CHAR(NOW(), 'YYYY-MM-DD'),
|
||||
PASSWD = XX1.ENC_VARCHAR2_INS(#{passwd}, 10, 'SHA256')
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
|
|
@ -692,26 +692,26 @@
|
|||
FROM (
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM (
|
||||
SELECT
|
||||
'PS0' AS PLACE1,
|
||||
SUM(NVL((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(NVL(POSITION204,0)) AS POSITION204,
|
||||
SUM(NVL(POSITION203,0)) AS POSITION203,
|
||||
SUM(NVL(POSITION202,0)) AS POSITION202,
|
||||
SUM(NVL(POSITION201,0)) AS POSITION201,
|
||||
SUM(NVL(POSITION104,0)) AS POSITION104,
|
||||
SUM(NVL(POSITION103,0)) AS POSITION103,
|
||||
SUM(NVL(POSITION102,0)) AS POSITION102
|
||||
SUM(COALESCE((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(COALESCE(POSITION204,0)) AS POSITION204,
|
||||
SUM(COALESCE(POSITION203,0)) AS POSITION203,
|
||||
SUM(COALESCE(POSITION202,0)) AS POSITION202,
|
||||
SUM(COALESCE(POSITION201,0)) AS POSITION201,
|
||||
SUM(COALESCE(POSITION104,0)) AS POSITION104,
|
||||
SUM(COALESCE(POSITION103,0)) AS POSITION103,
|
||||
SUM(COALESCE(POSITION102,0)) AS POSITION102
|
||||
FROM TAGENTNUM
|
||||
WHERE PLACE1 <> 'PS95'
|
||||
) A INNER JOIN (
|
||||
|
|
@ -740,15 +740,15 @@
|
|||
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM TAGENTNUM A
|
||||
INNER JOIN (
|
||||
SELECT
|
||||
|
|
@ -779,26 +779,26 @@
|
|||
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM (
|
||||
SELECT
|
||||
'PS001' AS PLACE1,
|
||||
SUM(NVL((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(NVL(POSITION204,0)) AS POSITION204,
|
||||
SUM(NVL(POSITION203,0)) AS POSITION203,
|
||||
SUM(NVL(POSITION202,0)) AS POSITION202,
|
||||
SUM(NVL(POSITION201,0)) AS POSITION201,
|
||||
SUM(NVL(POSITION104,0)) AS POSITION104,
|
||||
SUM(NVL(POSITION103,0)) AS POSITION103,
|
||||
SUM(NVL(POSITION102,0)) AS POSITION102
|
||||
SUM(COALESCE((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(COALESCE(POSITION204,0)) AS POSITION204,
|
||||
SUM(COALESCE(POSITION203,0)) AS POSITION203,
|
||||
SUM(COALESCE(POSITION202,0)) AS POSITION202,
|
||||
SUM(COALESCE(POSITION201,0)) AS POSITION201,
|
||||
SUM(COALESCE(POSITION104,0)) AS POSITION104,
|
||||
SUM(COALESCE(POSITION103,0)) AS POSITION103,
|
||||
SUM(COALESCE(POSITION102,0)) AS POSITION102
|
||||
FROM
|
||||
TAGENTNUM
|
||||
WHERE
|
||||
|
|
@ -832,15 +832,15 @@
|
|||
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM
|
||||
TAGENTNUM A LEFT OUTER JOIN (
|
||||
SELECT
|
||||
|
|
@ -889,15 +889,15 @@
|
|||
SELECT 'PS' AS PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM H3_CAREER_STAT
|
||||
|
|
@ -905,15 +905,15 @@
|
|||
SELECT 'PS00' AS PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM
|
||||
|
|
@ -927,15 +927,15 @@
|
|||
'PS001' AS PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM
|
||||
|
|
@ -948,15 +948,15 @@
|
|||
PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM
|
||||
|
|
@ -1088,7 +1088,7 @@
|
|||
VALUES (
|
||||
#{userid}, #{place1}, #{excareer_y}, #{excareer_m},
|
||||
#{excareer1_y}, #{excareer1_m}, #{excareer2_y}, #{excareer2_m}, #{excareer3_y}, #{excareer3_m},
|
||||
SYSDATE, SYSDATE
|
||||
NOW(), NOW()
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
@ -1106,7 +1106,7 @@
|
|||
CAREER2_M = #{excareer2_m},
|
||||
CAREER3_Y = #{excareer3_y},
|
||||
CAREER3_M = #{excareer3_m},
|
||||
ADATE = SYSDATE
|
||||
ADATE = NOW()
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
]]>
|
||||
|
|
@ -1163,7 +1163,7 @@
|
|||
<![CDATA[
|
||||
#{name}, #{chnname}, #{family}, #{address}, #{email}, #{hphone}, #{ophone}, #{cphone},
|
||||
#{sdate}, #{pdate}, #{adate}, #{place1}, #{place2}, #{place3}, #{position}, #{duties}, #{jobtype}, 'g',
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, SYSDATE
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, NOW()
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
@ -1195,7 +1195,7 @@
|
|||
<![CDATA[
|
||||
#{name}, #{chnname}, #{family}, #{address}, #{email}, #{hphone}, #{ophone}, #{cphone},
|
||||
#{sdate}, #{pdate}, #{adate}, #{place1}, #{place2}, #{place3}, #{position}, #{duties}, #{jobtype}, 'g',
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{usegrade}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, SYSDATE
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{usegrade}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, NOW()
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
|
|||
|
|
@ -588,9 +588,9 @@
|
|||
PLACE1 = #{place1}, PLACE2 = #{place2}, PLACE3 = #{place3},
|
||||
POSITION = #{position}, DUTIES = #{duties}, JOBTYPE = #{jobtype}, INOUT = #{inout}, SCHOLARSHIP = #{scholarship},
|
||||
EXCAREER = #{excareer}, EXCAREER1 = #{excareer1}, EXCAREER2 = #{excareer2}, EXCAREER3 = #{excareer3},
|
||||
COMMENT_ = #{comment_}, LOGINDATE = TO_CHAR(SYSDATE, 'YYYY-MM-DD'),
|
||||
COMMENT_ = #{comment_}, LOGINDATE = TO_CHAR(NOW(), 'YYYY-MM-DD'),
|
||||
CHARGE = #{charge}, EXPLACE = #{explace}, USEGRADE = #{usegrade}, USERIMG = #{userimg,jdbcType=VARCHAR}, USERSIGN = #{usersign,jdbcType=VARCHAR},
|
||||
CHKCNT = NVL(#{chkcnt}, 0)
|
||||
CHKCNT = COALESCE(#{chkcnt}, 0)
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
]]>
|
||||
|
|
@ -616,7 +616,7 @@
|
|||
</otherwise>
|
||||
</choose>
|
||||
<![CDATA[
|
||||
#{place1}, #{place2}, #{position}, TO_CHAR(SYSDATE, 'YYYYMMDD'), TO_CHAR(SYSDATE, 'YYYYMMDD'), #{writer} )
|
||||
#{place1}, #{place2}, #{position}, TO_CHAR(NOW(), 'YYYYMMDD'), TO_CHAR(NOW(), 'YYYYMMDD'), #{writer} )
|
||||
]]>
|
||||
</insert>
|
||||
|
||||
|
|
@ -634,7 +634,7 @@
|
|||
PLACE1 = #{place1},
|
||||
PLACE2 = #{place2},
|
||||
POSITION = #{position},
|
||||
CHKCNT = NVL(#{chkcnt}, 0)
|
||||
CHKCNT = COALESCE(#{chkcnt}, 0)
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
]]>
|
||||
|
|
@ -674,7 +674,7 @@
|
|||
</otherwise>
|
||||
</choose> <![CDATA[
|
||||
SET
|
||||
LOGINDATE = TO_CHAR(SYSDATE, 'YYYY-MM-DD'),
|
||||
LOGINDATE = TO_CHAR(NOW(), 'YYYY-MM-DD'),
|
||||
PASSWD = XX1.ENC_VARCHAR2_INS(#{passwd}, 10, 'SHA256')
|
||||
WHERE
|
||||
USERID = #{userid}]]>
|
||||
|
|
@ -690,26 +690,26 @@
|
|||
FROM (
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM (
|
||||
SELECT
|
||||
'PS0' AS PLACE1,
|
||||
SUM(NVL((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(NVL(POSITION204,0)) AS POSITION204,
|
||||
SUM(NVL(POSITION203,0)) AS POSITION203,
|
||||
SUM(NVL(POSITION202,0)) AS POSITION202,
|
||||
SUM(NVL(POSITION201,0)) AS POSITION201,
|
||||
SUM(NVL(POSITION104,0)) AS POSITION104,
|
||||
SUM(NVL(POSITION103,0)) AS POSITION103,
|
||||
SUM(NVL(POSITION102,0)) AS POSITION102
|
||||
SUM(COALESCE((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(COALESCE(POSITION204,0)) AS POSITION204,
|
||||
SUM(COALESCE(POSITION203,0)) AS POSITION203,
|
||||
SUM(COALESCE(POSITION202,0)) AS POSITION202,
|
||||
SUM(COALESCE(POSITION201,0)) AS POSITION201,
|
||||
SUM(COALESCE(POSITION104,0)) AS POSITION104,
|
||||
SUM(COALESCE(POSITION103,0)) AS POSITION103,
|
||||
SUM(COALESCE(POSITION102,0)) AS POSITION102
|
||||
FROM TAGENTNUM
|
||||
WHERE PLACE1 <> 'PS95'
|
||||
) A INNER JOIN (
|
||||
|
|
@ -738,15 +738,15 @@
|
|||
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM TAGENTNUM A
|
||||
INNER JOIN (
|
||||
SELECT
|
||||
|
|
@ -777,26 +777,26 @@
|
|||
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE(A.TOT_CNT, 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM (
|
||||
SELECT
|
||||
'PS001' AS PLACE1,
|
||||
SUM(NVL((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(NVL(POSITION204,0)) AS POSITION204,
|
||||
SUM(NVL(POSITION203,0)) AS POSITION203,
|
||||
SUM(NVL(POSITION202,0)) AS POSITION202,
|
||||
SUM(NVL(POSITION201,0)) AS POSITION201,
|
||||
SUM(NVL(POSITION104,0)) AS POSITION104,
|
||||
SUM(NVL(POSITION103,0)) AS POSITION103,
|
||||
SUM(NVL(POSITION102,0)) AS POSITION102
|
||||
SUM(COALESCE((POSITION204 + POSITION203 + POSITION202 + POSITION201 + POSITION104 + POSITION103 + POSITION102),0)) AS TOT_CNT,
|
||||
SUM(COALESCE(POSITION204,0)) AS POSITION204,
|
||||
SUM(COALESCE(POSITION203,0)) AS POSITION203,
|
||||
SUM(COALESCE(POSITION202,0)) AS POSITION202,
|
||||
SUM(COALESCE(POSITION201,0)) AS POSITION201,
|
||||
SUM(COALESCE(POSITION104,0)) AS POSITION104,
|
||||
SUM(COALESCE(POSITION103,0)) AS POSITION103,
|
||||
SUM(COALESCE(POSITION102,0)) AS POSITION102
|
||||
FROM
|
||||
TAGENTNUM
|
||||
WHERE
|
||||
|
|
@ -830,15 +830,15 @@
|
|||
|
||||
SELECT
|
||||
A.PLACE1 AS PLACE,
|
||||
NVL((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
NVL(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
NVL(A.POSITION204,0) AS POSITION204, NVL(B.CNT_204,0) AS CNT_204,
|
||||
NVL(A.POSITION203,0) AS POSITION203, NVL(B.CNT_203,0) AS CNT_203,
|
||||
NVL(A.POSITION202,0) AS POSITION202, NVL(B.CNT_202,0) AS CNT_202,
|
||||
NVL(A.POSITION201,0) AS POSITION201, NVL(B.CNT_201,0) AS CNT_201,
|
||||
NVL(A.POSITION104,0) AS POSITION104, NVL(B.CNT_104,0) AS CNT_104,
|
||||
NVL(A.POSITION103,0) AS POSITION103, NVL(B.CNT_103,0) AS CNT_103,
|
||||
NVL(A.POSITION102,0) AS POSITION102, NVL(B.CNT_102,0) AS CNT_102
|
||||
COALESCE((A.POSITION204 + A.POSITION203 + A.POSITION202 + A.POSITION201 + A.POSITION104 + A.POSITION103 + A.POSITION102), 0) AS TOT_CNT,
|
||||
COALESCE(B.CURRENT_CNT,0) AS CURRENT_CNT,
|
||||
COALESCE(A.POSITION204,0) AS POSITION204, COALESCE(B.CNT_204,0) AS CNT_204,
|
||||
COALESCE(A.POSITION203,0) AS POSITION203, COALESCE(B.CNT_203,0) AS CNT_203,
|
||||
COALESCE(A.POSITION202,0) AS POSITION202, COALESCE(B.CNT_202,0) AS CNT_202,
|
||||
COALESCE(A.POSITION201,0) AS POSITION201, COALESCE(B.CNT_201,0) AS CNT_201,
|
||||
COALESCE(A.POSITION104,0) AS POSITION104, COALESCE(B.CNT_104,0) AS CNT_104,
|
||||
COALESCE(A.POSITION103,0) AS POSITION103, COALESCE(B.CNT_103,0) AS CNT_103,
|
||||
COALESCE(A.POSITION102,0) AS POSITION102, COALESCE(B.CNT_102,0) AS CNT_102
|
||||
FROM
|
||||
TAGENTNUM A LEFT OUTER JOIN (
|
||||
SELECT
|
||||
|
|
@ -887,15 +887,15 @@
|
|||
SELECT 'PS' AS PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM H3_CAREER_STAT
|
||||
|
|
@ -903,15 +903,15 @@
|
|||
SELECT 'PS00' AS PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM
|
||||
|
|
@ -925,15 +925,15 @@
|
|||
'PS001' AS PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM
|
||||
|
|
@ -946,15 +946,15 @@
|
|||
PLACE1
|
||||
,SUM(CAREER_Y+CAREER1_Y+CAREER2_Y+CAREER3_Y) AS TOT_CNT_Y
|
||||
,SUM(CAREER_M+CAREER1_M+CAREER2_M+CAREER3_M) AS TOT_CNT_M
|
||||
,SUM(NVL(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(NVL(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(NVL(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(NVL(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(NVL(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(NVL(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(NVL(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(NVL(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(SYSDATE, 'MM'), '99') + (TO_NUMBER(TO_CHAR(SYSDATE, 'YYYY'), '9999')
|
||||
,SUM(COALESCE(CAREER_Y, 0)) AS CAREER_Y
|
||||
,SUM(COALESCE(CAREER_M, 0)) AS CAREER_M
|
||||
,SUM(COALESCE(CAREER1_Y, 0)) AS CAREER1_Y
|
||||
,SUM(COALESCE(CAREER1_M, 0)) AS CAREER1_M
|
||||
,SUM(COALESCE(CAREER2_Y, 0)) AS CAREER2_Y
|
||||
,SUM(COALESCE(CAREER2_M, 0)) AS CAREER2_M
|
||||
,SUM(COALESCE(CAREER3_Y, 0)) AS CAREER3_Y
|
||||
,SUM(COALESCE(CAREER3_M, 0)) AS CAREER3_M
|
||||
,SUM((TO_NUMBER(TO_CHAR(NOW(), 'MM'), '99') + (TO_NUMBER(TO_CHAR(NOW(), 'YYYY'), '9999')
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'YYYY'), '9999'))*12)
|
||||
- TO_NUMBER(TO_CHAR(TO_DATE(ADATE, 'YYYY-MM-DD'), 'MM'), '99')) AS ADD_CAREER
|
||||
FROM
|
||||
|
|
@ -1086,7 +1086,7 @@
|
|||
VALUES (
|
||||
#{userid}, #{place1}, #{excareer_y}, #{excareer_m},
|
||||
#{excareer1_y}, #{excareer1_m}, #{excareer2_y}, #{excareer2_m}, #{excareer3_y}, #{excareer3_m},
|
||||
SYSDATE, SYSDATE
|
||||
NOW(), NOW()
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
@ -1104,7 +1104,7 @@
|
|||
CAREER2_M = #{excareer2_m},
|
||||
CAREER3_Y = #{excareer3_y},
|
||||
CAREER3_M = #{excareer3_m},
|
||||
ADATE = SYSDATE
|
||||
ADATE = NOW()
|
||||
WHERE
|
||||
USERID = #{userid}
|
||||
]]>
|
||||
|
|
@ -1161,7 +1161,7 @@
|
|||
<![CDATA[
|
||||
#{name}, #{chnname}, #{family}, #{address}, #{email}, #{hphone}, #{ophone}, #{cphone},
|
||||
#{sdate}, #{pdate}, #{adate}, #{place1}, #{place2}, #{place3}, #{position}, #{duties}, #{jobtype}, 'g',
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, SYSDATE
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, NOW()
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
@ -1193,7 +1193,7 @@
|
|||
<![CDATA[
|
||||
#{name}, #{chnname}, #{family}, #{address}, #{email}, #{hphone}, #{ophone}, #{cphone},
|
||||
#{sdate}, #{pdate}, #{adate}, #{place1}, #{place2}, #{place3}, #{position}, #{duties}, #{jobtype}, 'g',
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{usegrade}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, SYSDATE
|
||||
#{scholarship}, #{excareer}, #{excareer1}, #{excareer2}, #{excareer3}, #{usegrade}, #{inout}, #{comment_}, #{userimg,jdbcType=VARCHAR}, NOW()
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
<select id="Report.selectPlaceNum" parameterType="reportVO" resultType="int">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
NVL(MAX(in_place_num), 0) + 1 AS inPlaceNum
|
||||
COALESCE(MAX(in_place_num), 0) + 1 AS inPlaceNum
|
||||
FROM
|
||||
RPT_INFO
|
||||
WHERE
|
||||
|
|
@ -210,7 +210,7 @@
|
|||
#{inMemo}, #{inSubject}, #{inType}, #{inPlace1}, #{inPlace2},
|
||||
#{inPosition}, #{inName}, #{inUserid}, #{inIp}, #{inFsseq},
|
||||
TO_DATE(#{inInfoYear} || '/' || #{inInfoMonth} || '/' || #{inInfoDay}, 'YY/MM/DD'),
|
||||
#{inInfoYear}, #{inInfoMonth}, #{inInfoDay}, SYSDATE,
|
||||
#{inInfoYear}, #{inInfoMonth}, #{inInfoDay}, NOW(),
|
||||
#{inStateCode}, #{inContent}, #{inAutoRemove}, #{inOfflineType}, #{inOfflineUserid},
|
||||
#{inReport}, #{inReport1}, #{inReport2}, #{inReport3}, #{inReport4}, #{inReport5}, #{inReport6},
|
||||
#{inJudge}, #{inJudge1}, #{inJudge2}, #{inJudge3}, #{inJudge4}, #{inJudge5}, #{inJudge6}
|
||||
|
|
@ -295,7 +295,7 @@
|
|||
FROM
|
||||
RPT_INFO
|
||||
WHERE
|
||||
IN_REGDATE <= ADD_MONTHS(SYSDATE, -3) AND
|
||||
IN_REGDATE <= NOW() + interval '-3 month' AND
|
||||
IN_AUTO_REMOVE = 1
|
||||
]]>
|
||||
</select>
|
||||
|
|
@ -862,7 +862,7 @@
|
|||
SELECT *
|
||||
FROM (
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
|
|
@ -919,7 +919,7 @@
|
|||
<select id="Report.selectAprListAll" parameterType="reportSearchVO" resultMap="reportMap">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
|
|
@ -953,14 +953,13 @@
|
|||
<!-- 내 실적 목록 -->
|
||||
<select id="Report.selectMyList" parameterType="reportSearchVO" resultMap="reportMap">
|
||||
<![CDATA[
|
||||
SELECT *
|
||||
FROM (
|
||||
SELECT *
|
||||
FROM (
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = RPT.IN_CATEGORY1) AS inCategory1Str,
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM (SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = RPT.IN_CATEGORY1) AS inCategory1Str,
|
||||
(SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = RPT.IN_CATEGORY2) AS inCategory2Str,
|
||||
(SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = RPT.IN_CATEGORY3) AS inCategory3Str,
|
||||
(SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = RPT.IN_CATEGORY4) AS inCategory4Str,
|
||||
|
|
@ -1033,7 +1032,7 @@
|
|||
<select id="Report.selectMyListAll" parameterType="reportSearchVO" resultMap="reportMap">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
|
|
@ -1081,7 +1080,7 @@
|
|||
SELECT *
|
||||
FROM (
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
|
|
@ -1220,7 +1219,7 @@
|
|||
SELECT *
|
||||
FROM (
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
|
|
@ -1282,7 +1281,7 @@
|
|||
<![CDATA[
|
||||
|
||||
SELECT
|
||||
ROWNUM AS RNUM, T.*
|
||||
(ROW_NUMBER() OVER()) AS RNUM, T.*
|
||||
FROM
|
||||
(SELECT
|
||||
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
SELECT
|
||||
A.NAME,
|
||||
A.USERID AS go_id,
|
||||
NVL(G.GO_GOAL1, 0) AS goGoal1,
|
||||
NVL(G.GO_GOAL2, 0) AS goGoal2,
|
||||
NVL(G.GO_GOAL3, 0) AS goGoal3,
|
||||
NVL(G.GO_GOAL4, 0) AS goGoal4,
|
||||
NVL(G.GO_TOTAL, 0) AS goTotal
|
||||
COALESCE(G.GO_GOAL1, 0) AS goGoal1,
|
||||
COALESCE(G.GO_GOAL2, 0) AS goGoal2,
|
||||
COALESCE(G.GO_GOAL3, 0) AS goGoal3,
|
||||
COALESCE(G.GO_GOAL4, 0) AS goGoal4,
|
||||
COALESCE(G.GO_TOTAL, 0) AS goTotal
|
||||
FROM
|
||||
(SELECT * FROM TAGENT WHERE PLACE1 = #{placeGroup}) A
|
||||
LEFT OUTER JOIN
|
||||
|
|
@ -79,8 +79,8 @@
|
|||
(
|
||||
SELECT
|
||||
NAME,
|
||||
NVL(GO_GOAL1, 0) AS GOAL1, NVL(GO_GOAL2, 0) AS GOAL2, NVL(GO_GOAL3, 0) AS GOAL3, NVL(GO_GOAL4, 0) AS GOAL4,
|
||||
NVL(GO_GOAL1, 0) + NVL(GO_GOAL2, 0) + NVL(GO_GOAL3, 0) + NVL(GO_GOAL4, 0) AS GOAL_TOTAL,
|
||||
COALESCE(GO_GOAL1, 0) AS GOAL1, COALESCE(GO_GOAL2, 0) AS GOAL2, COALESCE(GO_GOAL3, 0) AS GOAL3, COALESCE(GO_GOAL4, 0) AS GOAL4,
|
||||
COALESCE(GO_GOAL1, 0) + COALESCE(GO_GOAL2, 0) + COALESCE(GO_GOAL3, 0) + COALESCE(GO_GOAL4, 0) AS GOAL_TOTAL,
|
||||
(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '01') AS RESULT1,
|
||||
(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '02') AS RESULT2,
|
||||
(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 IN ('03', '04', '05')) AS RESULT3,
|
||||
|
|
@ -103,8 +103,8 @@
|
|||
(
|
||||
SELECT
|
||||
CODE2 AS CODE, CODENM AS NAME,
|
||||
SUM(NVL(GO_GOAL1, 0)) AS GOAL1, SUM(NVL(GO_GOAL2, 0)) AS GOAL2, SUM(NVL(GO_GOAL3, 0)) AS GOAL3, SUM(NVL(GO_GOAL4, 0)) AS GOAL4,
|
||||
SUM(NVL(GO_GOAL1, 0)) + SUM(NVL(GO_GOAL2, 0)) + SUM(NVL(GO_GOAL3, 0)) + SUM(NVL(GO_GOAL4, 0)) AS GOAL_TOTAL,
|
||||
SUM(COALESCE(GO_GOAL1, 0)) AS GOAL1, SUM(COALESCE(GO_GOAL2, 0)) AS GOAL2, SUM(COALESCE(GO_GOAL3, 0)) AS GOAL3, SUM(COALESCE(GO_GOAL4, 0)) AS GOAL4,
|
||||
SUM(COALESCE(GO_GOAL1, 0)) + SUM(COALESCE(GO_GOAL2, 0)) + SUM(COALESCE(GO_GOAL3, 0)) + SUM(COALESCE(GO_GOAL4, 0)) AS GOAL_TOTAL,
|
||||
(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '01') AS RESULT1,
|
||||
(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '02') AS RESULT2,
|
||||
(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 IN ('03', '04', '05')) AS RESULT3,
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
(JU_INSEQ, JU_GROUP_CODE, JU_CHKDATE, JU_JUDGE, JU_REPORT, JU_PLACE1, JU_PLACE2,
|
||||
JU_POSITION, JU_NAME, JU_USERID, JU_PROXY_ID, JU_DUTIES_CODE, JU_MESSAGE)
|
||||
VALUES
|
||||
(#{juInseq}, #{juGroupCode}, sysdate, #{juJudge}, #{juReport}, #{juPlace1}, #{juPlace2},
|
||||
(#{juInseq}, #{juGroupCode}, NOW(), #{juJudge}, #{juReport}, #{juPlace1}, #{juPlace2},
|
||||
#{juPosition}, #{juName}, #{juUserid}, #{juProxyId}, #{juDutiesCode}, #{juMessage})
|
||||
]]>
|
||||
<selectKey resultType="int" keyProperty="juInseq" order="AFTER">
|
||||
|
|
|
|||
|
|
@ -73,21 +73,13 @@
|
|||
|
||||
<select id="Security.getHierarchyRoles" resultType="map">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
*
|
||||
FROM (
|
||||
SELECT ROWNUM RNUM, ROLES_LIST.*
|
||||
FROM (
|
||||
SELECT
|
||||
A.CHILDREN_ROLE CHILD, A.PARENTS_ROLE PARENT
|
||||
FROM
|
||||
T_SSO_HIERARCHY_ROLES A
|
||||
LEFT JOIN T_SSO_HIERARCHY_ROLES B
|
||||
ON (A.CHILDREN_ROLE = B.PARENTS_ROLE)
|
||||
) ROLES_LIST
|
||||
)
|
||||
ORDER BY
|
||||
RNUM DESC
|
||||
SELECT
|
||||
(ROW_NUMBER() OVER()) AS RNUM, A.CHILDREN_ROLE CHILD, A.PARENTS_ROLE PARENT
|
||||
FROM
|
||||
T_SSO_HIERARCHY_ROLES A
|
||||
LEFT JOIN T_SSO_HIERARCHY_ROLES B
|
||||
ON (A.CHILDREN_ROLE = B.PARENTS_ROLE)
|
||||
order by RNUM desc
|
||||
]]>
|
||||
</select>
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@
|
|||
)
|
||||
VALUES
|
||||
(
|
||||
#{type}, #{agency}, #{chargeNm}, #{sdate}, SYSDATE,
|
||||
#{type}, #{agency}, #{chargeNm}, #{sdate}, NOW(),
|
||||
#{contents}, #{place1}, #{edate}, #{title}, #{result},
|
||||
#{writer}
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue