고지서 발송등록 쿼리 수정

src/main/java/cokr/xit/fims/levy/Levy.java

@@ -199,6 +199,9 @@ public class Levy extends AbstractEntity {
 	/** 단속 Ids */
 	private String[] crdnIds;
 		
+	/** 단속 테이블 과태료대장키 */
+	private String nxrpAcbKey;
+
 	/**최종본세(부과본세 - 수납본세 - 감액본세)를 반환한다.
 	 * @return 최종본세
 	 */

src/main/java/cokr/xit/fims/levy/LevyQuery.java

@@ -33,6 +33,8 @@ public class LevyQuery extends CmmnQuery {
     private String schRdctSeCd;                                                 // 감경 구분 코드
     private String schLevyYmdFrom;                                              // 부과 일자 시작
     private String schLevyYmdTo;                                                // 부과 일자 종료
+    private String schFrstDudtYmdFrom;                                          // 최초납기일자 시작
+    private String schFrstDudtYmdTo;                                            // 최초납기일자 종료    
     private String schRdctYmdFrom;                                              // 감경 일자 시작
     private String schRdctYmdTo;                                                // 감경 일자 종료
     private String schRdctRsnCd;                                                // 감경 사유 코드
@@ -217,6 +219,25 @@ public class LevyQuery extends CmmnQuery {
         return self();
     }
     
+    public String getSchFrstDudtYmdFrom() {
+        return ifEmpty(schFrstDudtYmdFrom, () -> null);
+    }
+
+    public <T extends LevyQuery> T setSchFrstDudtYmdFrom(String schFrstDudtYmdFrom) {
+        this.schFrstDudtYmdFrom = schFrstDudtYmdFrom;
+        return self();
+    }
+
+    public String getSchFrstDudtYmdTo() {
+        return ifEmpty(schFrstDudtYmdTo, () -> null);
+    }
+
+    public <T extends LevyQuery> T setSchFrstDudtYmdTo(String schFrstDudtYmdTo) {
+        this.schFrstDudtYmdTo = schFrstDudtYmdTo;
+        return self();
+    }
+    
+
     public String getSchCrdnYmdFrom() {
         return ifEmpty(schCrdnYmdFrom, () -> null);
     }

src/main/java/cokr/xit/fims/levy/dao/LevyMapper.java

@@ -175,4 +175,10 @@ public interface LevyMapper extends AbstractMapper {
 	 */
 	DataObject selectLevyAmt(LevyQuery req);
 	
+	/**지정한 조건에 따라 고지 대상 목록을 조회하여 반환한다.<br />
+	 * @param req 부과 대장 조회 조건
+	 * @return 고지 대상 목록
+	 */
+	List<Levy> selectLevyForGoji(LevyQuery req);	
+
 }

src/main/java/cokr/xit/fims/levy/service/LevyService.java

@@ -59,4 +59,6 @@ public interface LevyService {
 
 	String createRdctLevyList(LevyQuery req);
 	
+	List<Levy> getLevyForGoji(LevyQuery req);	
+
 }

src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java

@@ -282,4 +282,19 @@ public class LevyBean extends AbstractBean {
 
 		return "[S] 작업이 정상 처리 되었습니다.";
 	}
+	
+	/**지정한 조건에 따라 고지 대상 목록을 조회하여 반환한다.
+	 * @param req 고지 대상 조회 조건
+	 * @return 고지 대상 목록
+	 */
+	public List<Levy> getLevyForGoji(LevyQuery req) {
+		// 삭제 여부 확인
+		if (isEmpty(req.getDelYn()))
+			req.setDelYn("N");
+		// 정렬 확인
+		if (isEmpty(req.getOrderBy()))
+			req.setOrderBy(isEmpty(req.getBy()) ? "REG_DT" : CmmnUtil.convertCamelCaseToSnakeCase(req.getBy()));
+
+		return levyMapper.selectLevyForGoji(req);
+	}	
 }

src/main/java/cokr/xit/fims/levy/service/bean/LevyServiceBean.java

@@ -64,4 +64,9 @@ public class LevyServiceBean extends AbstractServiceBean implements LevyService
 		return levyBean.createRdctLevyList(req);
 	}
 	
+	@Override
+	public List<Levy> getLevyForGoji(LevyQuery req) {
+		return levyBean.getLevyForGoji(req);
+	}	
+
 }

src/main/java/cokr/xit/fims/nxrp/service/bean/SnisBean.java

@@ -281,6 +281,15 @@ public class SnisBean extends ScheduledBean {
 		return notices;
 	}
 	
+	public List<Ye22NoticeInfoDTO> lookupPreNotices(String buAk) {
+		Ye22InputDTO input = new Ye22InputDTO();
+		input.setBuAk(buAk);
+		input.setSystemGubun(FimsConf.get().getSystemGubun());
+		List<Ye22NoticeInfoDTO> notices = sntrisBean.getPreNoticeList(input);
+		update(notices);
+		return notices;
+	}	
+
 	private void update(Ye22NoticeInfoDTO notice, Levy levy) {
 		if (notice == null || levy == null) return;
 

src/main/java/cokr/xit/fims/sndb/SndbQuery.java

@@ -57,6 +57,10 @@ public class SndbQuery extends CmmnQuery {
 	private String schFyr;														// 회계연도
 	private String schLevyNoFrom;												// 부과번호 시작
 	private String schLevyNoTo;													// 부과번호 종료
+	private String schLevyYmdFrom;												// 부과일자 시작
+	private String schLevyYmdTo;												// 부과일자 종료
+	private String schFrstDudtYmdFrom;											// 최초납기일자 시작
+	private String schFrstDudtYmdTo;											// 최초납기일자 종료
 
 	// 상세 검색 조건
 
@@ -397,6 +401,24 @@ public class SndbQuery extends CmmnQuery {
 		return self();
 	}
 	
+	public String getSchLevyYmdFrom() {
+		return ifEmpty(schLevyYmdFrom, () -> null);
+	}
+
+	public <T extends SndbQuery> T setSchLevyYmdFrom(String schLevyYmdFrom) {
+		this.schLevyYmdFrom = schLevyYmdFrom;
+		return self();
+	}
+	
+	public String getSchLevyYmdTo() {
+		return ifEmpty(schLevyYmdTo, () -> null);
+	}
+
+	public <T extends SndbQuery> T setSchLevyYmdTo(String schLevyYmdTo) {
+		this.schLevyYmdTo = schLevyYmdTo;
+		return self();
+	}	
+
 	public String getSchFrstDudtYmd() {
 		return ifEmpty(schFrstDudtYmd, () -> null);
 	}
@@ -406,6 +428,24 @@ public class SndbQuery extends CmmnQuery {
 		return self();
 	}
 	
+	public String getSchFrstDudtYmdFrom() {
+		return ifEmpty(schFrstDudtYmdFrom, () -> null);
+	}
+
+	public <T extends SndbQuery> T setSchFrstDudtYmdFrom(String schFrstDudtYmdFrom) {
+		this.schFrstDudtYmdFrom = schFrstDudtYmdFrom;
+		return self();
+	}
+	
+	public String getSchFrstDudtYmdTo() {
+		return ifEmpty(schFrstDudtYmdTo, () -> null);
+	}
+
+	public <T extends SndbQuery> T setSchFrstDudtYmdTo(String schFrstDudtYmdTo) {
+		this.schFrstDudtYmdTo = schFrstDudtYmdTo;
+		return self();
+	}	
+
 	public String getSchFyr() {
 		return ifEmpty(schFyr, () -> null);
 	}

src/main/java/cokr/xit/fims/sndb/service/SndngDtlService.java

@@ -60,6 +60,8 @@ public interface SndngDtlService {
 	 */
 	String updatePreNotice(SndngDtl sndngDtl);
 	
+	String updatePreNotice(String buAk);
+	
 	void updatePreNotices();
 
 	/**지정한 조건에 따라 반송 목록을 조회하여 반환한다.

src/main/java/cokr/xit/fims/sndb/service/bean/SndngDtlServiceBean.java

@@ -82,6 +82,12 @@ public class SndngDtlServiceBean extends ScheduledServiceBean implements SndngDt
 		return "[S] 저장됐습니다.";
 	}
 	
+	@Override
+	public String updatePreNotice(String buAk) {
+		snisBean.lookupPreNotices(buAk);
+		return "[S] 저장됐습니다.";
+	}	
+
 	@Override
 	public void updatePreNotices() {
 		execute(snisBean, () -> snisBean.lookupPreNotices((SndbQuery)null));

src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java

@@ -57,6 +57,11 @@ import cokr.xit.foundation.UserInfo;
 import cokr.xit.foundation.data.DataObject;
 import cokr.xit.foundation.data.DataProc;
 
+import cokr.xit.fims.levy.LevyQuery;
+import cokr.xit.fims.levy.Levy;
+import cokr.xit.fims.levy.service.LevyService;
+import cokr.xit.fims.levy.service.bean.LevyBean;
+
 /**발송대장 서비스의 웹 컨트롤러
 *
 * <p>상세 설명:
@@ -146,6 +151,9 @@ public class Sndb01Controller extends ApplicationController {
     /**업무 정보 서비스*/
     @Resource(name="taskBean")
     private TaskBean taskBean;
+    /**부과 서비스*/
+    @Resource(name="levyService")
+    private LevyService levyService;    
     /**통합 조회 서비스*/
     @Resource(name="integrationSearchService")
     private IntegrationSearchService integrationSearchService;
@@ -2224,9 +2232,41 @@ public class Sndb01Controller extends ApplicationController {
     @RequestMapping(name="세외수입 체납상세 세목정보 조회", value=METHOD_URL.getNonTaxReceiptSpecialB01List)
     public ModelAndView getNonTaxReceiptSpecialB01List(SndbQuery req) {
         boolean saved = false;
+        
+        LevyQuery levyQuery = new LevyQuery().setSchLevyYmdFrom(req.getSchLevyYmdFrom())
+				  .setSchLevyYmdTo(req.getSchLevyYmdTo())
+				  .setSchFrstDudtYmdFrom(req.getSchFrstDudtYmdFrom())
+				  .setSchFrstDudtYmdTo(req.getSchFrstDudtYmdTo())
+				  .setSchFyr(req.getSchFyr());
+        
+    	List<Levy> levys = levyService.getLevyForGoji(levyQuery);
+        
+    	String rtnMsg = levys.isEmpty() ? "[F] 자료를 찾지못했습니다." : "";
+        
+        for (Levy levy: levys) {
+            //sndngDtlService.updatePreNotice((String) levy.get("nxrpAcbKey"));
+            saved = rtnMsg.contains("[S]");
+        }
+        
+        saved = true;
+        
+        ModelAndView mav = new ModelAndView("jsonView")
+			.addObject("saved", saved)
+			.addObject("rtnMsg", rtnMsg);
+        if (saved) {
+        	levys = levyService.getLevyForGoji(levyQuery);
+            mav.addObject("tnocs", levys.size())
+               .addObject("gramt", levys.stream().mapToInt(Levy::getLastAmt).sum())
+            ;
+        }        
+        
+        return mav;
+        
+       /*
     	List<SndngDtl> sndngDtls = sndngDtlService.getSndngDetails(req.setSndngDtlSttsCds(List.of(
-    		"04", "05", "06", "07", "08"
+    		"01", "02", "03","04", "05", "06", "07"
     	)));
+    	
         String rtnMsg = sndngDtls.isEmpty() ? "[F] 자료를 찾지못했습니다." : "";
         boolean lntris = "lntris".equals(TaskProcessor.get().getNtrisInterface(req.getTaskSeCd()));
 
@@ -2244,7 +2284,7 @@ public class Sndb01Controller extends ApplicationController {
                .addObject("gramt", sndngDtls.stream().mapToInt(SndngDtl::getLastAmt).sum());
         }
 
-    	return mav;
+   	
 /*
         boolean saved = false;
         String rtnMsg = "";

src/main/resources/sql/mapper/fims/levy/levy-mapper.xml

@@ -105,6 +105,7 @@
         <result property="removedAt"    column="DEL_DT" />          <!-- 삭제 일시 -->
         <result property="removedBy"    column="DLTR" />            <!-- 삭제자 -->
         <result property="delRsn"       column="DEL_RSN" />         <!-- 삭제 사유 -->
+        <result property="nxrpAcbKey"   column="NXRP_ACB_KEY" />    <!-- 단속 테이블 과태료 대장키 -->
     </resultMap>
 
     <sql id="selectTrgtList">
@@ -1134,4 +1135,18 @@
            AND C.DEL_YN         =  'N'          <!-- 삭제 여부 -->
     </select>
     
+    <select id="selectLevyForGoji" parameterType="map" resultMap="levyRow">/* 고지 대상 가져오기(levyMapper.selectLevyForGoji) */
+		SELECT C.NXRP_ACB_KEY,
+		       L.LAST_AMT
+		  FROM TB_LEVY L
+		       INNER JOIN TB_CRDN C ON L.CRDN_ID = C.CRDN_ID
+		 WHERE L.DEL_YN = 'N' 
+		   AND L.FYR = #{schFyr}
+		   AND L.LEVY_YMD BETWEEN #{schLevyYmdFrom} AND #{schLevyYmdTo}
+		   AND L.FRST_DUDT_YMD BETWEEN #{schFrstDudtYmdFrom} AND #{schFrstDudtYmdTo}
+		   AND C.CRDN_STTS_CD &lt; '70'
+		   AND C.NXRP_CRDN_LINK_YN = 'Y'
+		   AND C.NXRP_ACB_KEY IS NOT null    	   
+    </select>    
+
 </mapper>

src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml

@@ -704,6 +704,12 @@
             </if>
             <if test="taskSeCd != null">
            		AND L.TASK_SE_CD =  #{taskSeCd}  <!-- 업무 구분 코드 -->
+            </if>
+            <if test="schLevyYmdFrom != null and schLevyYmdTo != null">
+		    	AND L.LEVY_YMD BETWEEN #{schLevyYmdFrom} AND #{schLevyYmdTo}		   
+            </if>
+            <if test="schFrstDudtYmdFrom != null and schFrstDudtYmdTo != null">
+           		AND L.FRST_DUDT_YMD BETWEEN #{schFrstDudtYmdFrom} AND #{schFrstDudtYmdTo}
             </if>                        
            	AND L.DEL_YN     =  'N'          <!-- 삭제 여부 -->
            	AND C.DEL_YN     =  'N'          <!-- 삭제 여부 -->
@@ -732,6 +738,9 @@
              , C.CRDN_ID        <!-- 단속 ID -->
              , SUM(L.LAST_AMT) OVER() AS GRAMT  <!-- 총금액 -->
         <include refid="fromNhtTrgt" />
+		   AND C.CRDN_STTS_CD &lt; '70'
+		   AND C.NXRP_CRDN_LINK_YN = 'Y'
+		   AND C.NXRP_ACB_KEY IS NOT null    	          
         <include refid="utility.orderBy" />
     </select>
 

src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml

@@ -108,8 +108,10 @@ SELECT *
 <where>
 <if test='sndngDtlIds != null'>AND SNDNG_DTL_ID IN (<foreach collection="sndngDtlIds" item="sndngDtlId" separator=",">#{sndngDtlId}</foreach>)</if>
 <if test='crdnIds != null'>AND CRDN_ID IN (<foreach collection="crdnIds" item="crdnId" separator=",">#{crdnId}</foreach>)</if>
-<if test='schLevyYmd != null'>AND LEVY_YMD = #{schLevyYmd}</if>
+<if test='schLevyYmd != null'>	AND LEVY_YMD = #{schLevyYmd}</if>
+<if test='schLevyYmdFrom != null and schLevyYmdTo != null'>	AND LEVY_YMD BETWEEN #{schLevyYmdFrom} AND #{schLevyYmdTo}</if>
 <if test='schFrstDudtYmd != null'>   AND DUDT_YMD = #{schFrstDudtYmd}</if>
+<if test='schFrstDudtYmdFrom != null and schFrstDudtYmdTo != null'>AND DUDT_YMD BETWEEN #{schFrstDudtYmdFrom} AND #{schFrstDudtYmdTo}</if>
 <if test='schFyr != null'>   AND FYR = #{schFyr}</if>
 <if test="sndngDtlSttsCds != null">   AND SNDNG_DTL_STTS_CD IN (<foreach collection="sndngDtlSttsCds" item="sttsCd" separator=",">#{sttsCd}</foreach>)</if>
    AND DEL_YN = 'N'