Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

src/main/java/seed/com/user/dao/MediationDao.java

@@ -37,4 +37,6 @@ public interface MediationDao {
 	public void commentUpdate(Map<String,Object> paramMap);
 	public void commentCancel(Map<String,Object> paramMap);
 	public Map<String, Object> selectCaseComment(Map<String,Object> paramMap);
+	public void asSignUpdate(Map<String,Object> paramMap);
+	public void deptConfirmUpdate(Map<String,Object> paramMap);
 }

src/main/java/seed/com/user/dao/MediationDaoImpl.java

@@ -178,4 +178,14 @@ public class MediationDaoImpl implements MediationDao {
 	public Map<String, Object> selectCaseComment(Map<String, Object> paramMap) {
 		return sqlSession.selectOne("mediation.selectCaseComment", paramMap);
 	}
+	
+    @Override
+    public void asSignUpdate(Map<String, Object> paramMap) {
+        sqlSession.update("mediation.asSignUpdate", paramMap);
+    }
+    
+    @Override
+    public void deptConfirmUpdate(Map<String, Object> paramMap) {
+        sqlSession.update("mediation.deptConfirmUpdate", paramMap);
+    }
 }

src/main/java/seed/com/user/mediation/MediationController.java

@@ -1489,6 +1489,11 @@ public class MediationController {
 				log.error("CHECK ERROR:",e);
 			}
 			
+			//운영 소스에는 존재하는 배정 처리 소스(부원장 : 0000, 실장 : 유형에 맞는 부서 배정 처리)
+            /*if ("1602000000".equals(paramMap.get("requestCheck"))) {
+                this.service.asSignUpdate(paramMap);
+                this.service.deptConfirmUpdate(paramMap);
+             }*/			
 			
 			map.put("siteIdx", "case");
 			map.put("url", "/user/mypage/case/01/169/myMediationList.do");

src/main/java/seed/com/user/mediation/MediationService.java

@@ -144,4 +144,12 @@ public class MediationService {
     public Map<String, Object> selectCaseComment(Map<String, Object> paramMap){
         return dao.selectCaseComment(paramMap);
     }
+    
+    public void asSignUpdate(Map<String, Object> paramMap) {
+        this.dao.asSignUpdate(paramMap);
+     }
+
+     public void deptConfirmUpdate(Map<String, Object> paramMap) {
+        this.dao.deptConfirmUpdate(paramMap);
+     }
 }

src/main/java/seed/com/user/mediation/WebMediationController.java

@@ -4016,6 +4016,11 @@ public class WebMediationController {
 					
 				//접수마스터 UPDATE
 				service.rceptmstUpdate(paramMap);
+				//접수마스터 배정(부원장 : 0000, 실장 : 유형별 부서)
+				if ("1602000000".equals(paramMap.get("requestCheck"))) {
+					this.service.asSignUpdate(paramMap);
+					this.service.deptConfirmUpdate(paramMap);
+				}
 				
 				// 사건현황, 협의회별 상세 현황  INSERT
 				service.rceUpdate(paramMap);

src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml

@@ -371,10 +371,9 @@
 			<if test="requestCheck == '1602000000'">
 			FTC_CHECK = 'N',
 			STATE = '0302000000',
-			PRESIDENT_ASSIGN = '0000',	<!-- 접수 시 부원장 단계 뛰어 넘고 실장부터 처리하게 위하여 -->
+			CASE_DATE = SYSDATE,
-			PRESIDENT_ASSIGN_DT = SYSDATE,
 			</if>
-			REG_DT = SYSDATE
+			MOD_DT = SYSDATE
 		WHERE RCEPT_NO = #{rceptNo}
 	</update>
 	
@@ -1416,4 +1415,24 @@
         AND
             SEQ_NO = #{isSeq}
     </select>
+    
+    <update id="asSignUpdate" parameterType="egovMap">
+    UPDATE C_RCEPTMST
+    SET STATE = '0302000000',
+    PRESIDENT_ASSIGN = '0000',
+    PRESIDENT_ASSIGN_DT = SYSDATE
+    <where>
+    RCEPT_NO = #{rceptNo}
+    </where>
+  </update>
+
+  <update id="deptConfirmUpdate" parameterType="egovMap">
+    UPDATE C_RCEPTMST
+    SET
+    SCCHF_ASSIGN = #{presidentAssign},
+    SCCHF_ASSIGN_DT = SYSDATE,
+    TIMHDER_ASSIGN = #{presidentAssign},
+    TIMHDER_ASSIGN_DT = SYSDATE
+    WHERE RCEPT_NO = #{rceptNo}
+  </update>
 </mapper>

src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml

@@ -186,51 +186,6 @@
       AND A.DEL_YN = 'N'
       AND A.RCEPT_NO IS NOT NULL
       AND A.CASE_END = 'N'
-      
-      <if test="groupType == '3-1'">
-      /*	착수보고서	*/
-      		AND A.STATE_PRO = '0401000000'    
-
-			AND 0>=(SELECT count(*) 
-   				FROM C_SANCTNHISTORY
-   				WHERE case_no =a.CASE_NO 
-   					AND code_no like '5%01000000'
-   					AND RESULT IS NOT null)      		  	
-      </if><if test="groupType == '3-12'">
-      /*	조사보고서	*/	
-      		AND A.STATE_PRO = '0404000000'   
-      		   	
-      		AND A.MEDIATION_BIG IS NOT NULL
-      		AND A.MEDIATION_SMALL IS NOT NULL
-      		
-			AND 0>=(SELECT count(*) 
-   				FROM C_SANCTNHISTORY
-   				WHERE case_no =a.CASE_NO 
-   					AND code_no like '5%12000000'
-   					AND RESULT IS NOT null)      		
-      		
-      </if><if test="groupType == '3-11'">
-      /*	종료보고서	*/
-      		AND A.STATE_PRO = '0404000000'
-      		
-      		AND A.MEDIATION_BIG IS NOT NULL
-      		AND A.MEDIATION_SMALL IS NOT NULL      		    
-			AND A.MEDIATION_REQ_AMOUNT IS NOT NULL
-			AND A.MEDIATION_AMOUNT IS NOT NULL
-			AND A.FEE_MONEY IS NOT NULL
-			AND A.POST_MONEY IS NOT NULL
-			AND A.LAWYER_MONEY IS NOT NULL
-			AND A.COURT_MONEY IS NOT NULL
-			AND A.RESULT_MONEY IS NOT NULL	       		     
-      		
-			AND 0>=(SELECT count(*) 
-   				FROM C_SANCTNHISTORY
-   				WHERE case_no =a.CASE_NO 
-   					AND code_no like '5%11000000'
-   					AND RESULT IS NOT null)           		 	
-      </if>
-            
-      
       <if test='memberPosition neq "0915000000"'>
         <choose>
           <when test="memberPosition eq '0910000000' or memberPosition eq '0903000000' or (memberPosition eq '0913000000' and memberDept eq '1010000000')">