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

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

@@ -59,10 +59,8 @@ public class ApproveServiceImpl implements ApproveService {
 	}
 
 	@Override
-	public HashMap<String, Object> insert(final ApproveVO dataVO,
+	public HashMap<String, Object> insert(final ApproveVO dataVO, final Map<String, MultipartFile> fileMap) throws Exception {
-			final Map<String, MultipartFile> fileMap) throws Exception {
 		HashMap<String, Object> result = new HashMap<String, Object>();
-		
 		// 이미 결재 내역이 있으면 결재하지 않는다.
 		ApproveVO vo = select(dataVO);
 		if (vo == null) {

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

@@ -431,10 +431,8 @@ public class EquipmentController {
 	public String approve(final ApproveVO approveVO, final Model model) throws Exception {
 		HashMap<String, Object> result = approveService.insert(approveVO, null);
 		if ("1".equals(result.get("result").toString())) {
-			return String
+			return String.format("redirect:/equip/useStateWaiting.do?police=%s&year=%s&quater=%s",
-					.format("redirect:/equip/useStateWaiting.do?police=%s&year=%s&quater=%s",
+          approveVO.getPolice(), approveVO.getYear(), approveVO.getQuater());
-							approveVO.getPolice(), approveVO.getYear(),
-							approveVO.getQuater());
 		}
 		return useStateApprove(approveVO, model);
 	}

src/main/java/kcg/faics/susa/web/PromotController.java

@@ -253,10 +253,8 @@ public class PromotController {
 			promotVO.setWriter(loginUserVO.getUserid());
 
 			// 파일 저장 및 데이터 입력
-			final Map<String, MultipartFile> fileMap = multiRequest
+			final Map<String, MultipartFile> fileMap = multiRequest.getFileMap();
-					.getFileMap();
+			HashMap<String, Object> map = susaService.insert(promotVO, fileMap);
-			HashMap<String, Object> map = susaService.insert(promotVO,
-					fileMap);
 
 			status.setComplete();
 

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

@@ -382,12 +382,9 @@
 	    </selectKey>
 	</insert>
 	
-	<update id="updateEquipment" parameterType="arrestVO">
+	<update id="updateEquipment" parameterType="equipVO">
-	<![CDATA[
+		UPDATE TEQUIPMENT
-		UPDATE
+		SET NUM = #{num},
-			TEQUIPMENT
-		SET
-			NUM = #{num},
 			EQUIPGUBUN = #{equipType},
 			EQUIPNAME = #{equipName},
 			POLICE = #{police},
@@ -408,20 +405,11 @@
 			FILENAME2 = #{fileName2},
 			FILENAME3 = #{fileName3},
 			LOGDATE = TO_CHAR(NOW(), 'YYYYMMDDHH24MISS')
-		 WHERE 
+		 WHERE SERNO = #{serNo}
-		    SERNO = #{serNo}
-			
-
-			
-			
-			
-	]]>
 	</update>
 	
 	<delete id="deleteEquipment" parameterType="equipVO">
-	<![CDATA[
 		DELETE FROM TEQUIPMENT		   
 		 WHERE SERNO = #{serNo}
-	]]>
 	</delete>
 </mapper>

src/main/resources/sqlmapper/mappers/susa/susa.xml

@@ -129,20 +129,33 @@
 	</select>
 
 	<insert id="Susa.insert" parameterType="susaVO">
-		INSERT INTO H3_SUSA_LIST
+    insert into H3_SUSA_LIST (
-		(
+        SS_TYPE,
-	    	SS_TYPE, SS_AGENCY, SS_CHARGE_NM, SS_SDATE, SS_REGDATE,
+        SS_AGENCY,
-	        SS_CONTENTS, SS_PLACE1, SS_EDATE, SS_TITLE, SS_RESULT, 
+        SS_CHARGE_NM,
+        SS_SDATE,
+        SS_REGDATE,
+        SS_CONTENTS,
+        SS_PLACE1,
+        SS_EDATE,
+        SS_TITLE,
+        SS_RESULT,
         SS_WRITER
-	    )
+    ) values (
-		VALUES
+        #{type},
-		(
+        #{agency},
-	    	#{type}, #{agency}, #{chargeNm}, #{sdate}, NOW(),
+        #{chargeNm},
-	        #{contents}, #{place1}, #{edate}, #{title}, #{result},
+        #{sdate},
+        NOW(),
+        #{contents},
+        #{place1},
+        #{edate},
+        #{title},
+        #{result},
         #{writer}
     )
 		<selectKey resultType="int" keyProperty="idx" order="AFTER">
-			SELECT H3_SUSA_LIST_SS_IDX_SEQ.CURRVAL FROM DUAL
+      SELECT currval('susa_list_seq') as idx
 		</selectKey>
 	</insert>
 

src/main/resources/sqlmapper/mappers/susa/susaFile.xml

@@ -38,10 +38,8 @@
 	]]>
 	</select>
 	
-	<insert id="SusaFile.insert" parameterType="susaVO" useGeneratedKeys="true" keyColumn="SF_SEQ">
+	<insert id="SusaFile.insert" parameterType="susaVO">
-	<![CDATA[
+		INSERT INTO H3_SUSA_FILE (
-		INSERT INTO 
-			H3_SUSA_FILE (
         SF_ORDER,
         SF_ORG_NAME,
         SF_SAVE_NAME,
@@ -52,7 +50,6 @@
 		  	#{saveName},
 		  	#{parentSeq}
 		)
-	]]>
 	</insert>
 	
 	<delete id="SusaFile.delete" parameterType="susaVO">