Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java

@@ -170,7 +170,7 @@ public class EquipmentServiceImpl implements EquipmentService {
 		while (it.hasNext()) {
 			HashMap<String, Object> value = paramMap.get(it.next());
 			HashMap<String, Object> record = equipmentMapper.getEquipUseStateInfoByCode(value);
-			boolean isInsert = (record == null) ? true : false;
+			boolean isInsert = record == null;
 			
 			if (isInsert) {
 				success = equipmentMapper.insertEquipUseState(value);

src/main/java/kcg/faics/equip/vo/EquipVO.java

@@ -10,7 +10,7 @@ package kcg.faics.equip.vo;
  * 
  */
 public class EquipVO {
-	private String serNo;
+	private Integer serNo;
 	private String num;
 	private String equipType;
 	private String equipTypeName;
@@ -41,7 +41,7 @@ public class EquipVO {
 	/**
 	 * @return the serNo
 	 */
-	public String getSerNo() {
+	public Integer getSerNo() {
 		return serNo;
 	}
 	
@@ -90,7 +90,7 @@ public class EquipVO {
 	/**
 	 * @param serNo the serNo to set
 	 */
-	public void setSerNo(String serNo) {
+	public void setSerNo(Integer serNo) {
 		this.serNo = serNo;
 	}
 	/**

src/main/java/kcg/faics/equip/web/EquipmentController.java

@@ -598,7 +598,7 @@ public class EquipmentController {
 			final Map<String, MultipartFile> fileMap = multiRequest.getFileMap();
 
 
-			if( equipVO.getSerNo().equals("") || equipVO.getSerNo().equals(null)){
+			if(equipVO.getSerNo()==null || equipVO.getSerNo() == 0){
 				/* 등록 처리 */
 
 				equipVO.setWriter(loginUserVO.getUserid());

src/main/resources/sqlmapper/mappers/fa/equip.xml

@@ -2,10 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="Equip">
 
-	<resultMap id="resultMap" type="hashmap">
-	    <result property="EU_DETAIL" column="EU_DETAIL" jdbcType="CLOB" javaType="java.lang.String" />
-	</resultMap>
-
 	<resultMap id="useStateResult" type="useStateVO">
 		<result property="police" column="EU_POLICE" />
 		<result property="policeStr" column="EU_POLICE_NM" />
@@ -175,27 +171,23 @@
 	]]>
 	</select>
 	
-	<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultMap="resultMap">
+	<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultType="hashmap">
 	<![CDATA[
-		SELECT
+		SELECT B.CODENM,
-		  B.CODENM, B.CODE2, A.*
+		       B.CODE2,
-		FROM
+		       A.*
-		(
+		FROM (SELECT *
-		  SELECT *
+          FROM H3_EQUIP_USE_STATE
-		  FROM H3_EQUIP_USE_STATE
+          WHERE EU_YEAR =  (#{year}||'')
-		  WHERE EU_YEAR =  (#{year}||'')
+            AND EU_QUATER =  (#{quater}||'')
-		    AND EU_QUATER =  (#{quater}||'')
+            AND EU_POLICE =  #{police}) A
-		    AND EU_POLICE =  #{police}
+		      RIGHT JOIN
-		) A
+         (SELECT CODE2, CODENM
-		RIGHT JOIN
+          FROM TCODE
-		  (
+          WHERE CODE1 = 'EQUI'
-		    SELECT CODE2, CODENM
+            AND CODE_USE_YN = 'Y'
-		    FROM TCODE
+          ORDER BY CODE2 ) B
-		    WHERE CODE1 = 'EQUI'
+		        ON A.EU_CODE = B.CODE2
-		      AND CODE_USE_YN = 'Y'
-		    ORDER BY CODE2
-		) B
-		ON A.EU_CODE = B.CODE2
 		ORDER BY B.CODE2
 	]]>
 	</select>
@@ -223,14 +215,15 @@
 	</insert>
 	
 	<update id="Equip.updateEquipUseState" parameterType="hashmap">
-		UPDATE 
+		UPDATE H3_EQUIP_USE_STATE
-			H3_EQUIP_USE_STATE 
+		SET EU_CNT = #{cnt},
-		SET 
+		    EU_DETAIL = #{detail},
-			EU_CNT = #{cnt}, EU_DETAIL = #{detail},
+			  EU_STATE = #{state},
-			EU_STATE = #{state}, EU_CHECK = #{check}
+		    EU_CHECK = #{check}
-		WHERE
+		WHERE EU_POLICE = #{police}
-			EU_POLICE = #{police} AND EU_YEAR = #{year} AND
+      AND EU_YEAR =  (#{year}||'')
-			EU_QUATER = #{quater} AND EU_CODE = #{code}
+      AND EU_QUATER =  (#{quater}||'')
+		  AND EU_CODE = #{code}
 	</update>
 	
 	<!-- 사용실적 결재 -->
@@ -334,60 +327,58 @@
 	</select>
 	
 	<insert id="Equip.insertEquipment" parameterType="equipVO">
-	<![CDATA[	
+    INSERT INTO TEQUIPMENT(
-INSERT INTO TEQUIPMENT 
+          NUM,
-   (  SERNO,
+          POLICE,
-      NUM,
+          EQUIPGUBUN,
-      POLICE,
+          EQUIPNAME,
-      EQUIPGUBUN,
+          BYEAR,BMON,
-      EQUIPNAME,
+          BDAY,USETERM,
-      BYEAR,BMON,
+          STANDARD,
-      BDAY,USETERM,                          
+          PURPOSE,
-      STANDARD,
+          BPLACE,
-      PURPOSE,
+          PRICE,
-      BPLACE,
+          MADEIN,
-      PRICE,
+          SERIALNO,
-      MADEIN,
+          OPERATE,
-      SERIALNO,
+          USESECTION,
-      OPERATE,
+          BIGO,
-      USESECTION,
+          FILENAME1,
-      BIGO,
+          FILENAME2,
-      FILENAME1,
+          FILENAME3,
-      FILENAME2,
+          CREADATE,
-      FILENAME3,
+          WRITER,
-      CREADATE,
+          LOGDATE)
-      WRITER,
+      values (
-      LOGDATE) 
+           (CASE
- 	values (
+              WHEN (SELECT MAX(NUM) FROM TEQUIPMENT WHERE POLICE = #{police}) IS NULL THEN 1
-       TEQUIPMENT_SERNO_SEQ.NEXTVAL,
+              ELSE (SELECT MAX(NUM) + 1 FROM TEQUIPMENT WHERE POLICE = #{police})
-       (CASE WHEN (SELECT MAX(NUM) FROM TEQUIPMENT WHERE POLICE = #{police}) IS NULL THEN 1 
+           END),
-            ELSE (SELECT MAX(NUM) + 1 FROM TEQUIPMENT WHERE POLICE = #{police}) END),
+           #{police},
-       #{police},
+           #{equipType},
-       #{equipType},
+           #{equipName},
-       #{equipName},
+           #{buyYear},
-       #{buyYear},
+           #{buyMonth},
-       #{buyMonth},
+           #{buyDay},
-       #{buyDay},
+           #{useTerm},
-       #{useTerm},
+           #{standard},
-       #{standard},
+           #{purpose},
-       #{purpose},
+           #{buyPlace},
-       #{buyPlace},
+           #{price},
-       #{price},
+           #{madeIn},
-       #{madeIn},
+           #{serialNo},
-       #{serialNo},
+           #{operate},
-       #{operate},
+           #{useSection},
-       #{useSection},
+           #{bigo},
-       #{bigo},
+           #{fileName1},
-       #{fileName1},
+           #{fileName2},
-       #{fileName2},
+           #{fileName3},
-       #{fileName3},
+           TO_CHAR(NOW(), 'YYYYMMDDHH24MISS'),
-       TO_CHAR(NOW(), 'YYYYMMDDHH24MISS'),
+           #{writer},
-       #{writer},
+           NULL
-       NULL
+        )
-     )
+      <selectKey resultType="int" keyProperty="serNo" order="AFTER">
-	]]>
+        SELECT currval('tequip_seq') as seq
-		<selectKey resultType="String" keyProperty="serNo" order="AFTER">
-	        SELECT TEQUIPMENT_SERNO_SEQ.CURRVAL FROM DUAL
 	    </selectKey>
 	</insert>