1. 외주요청파일 바코드 생성 메소드 추가

2. 외주요청파일 내 사진파일명 수정
3. 주석 오타 수정
main
이범준 8 months ago
parent 4184049932
commit 2b8547f7bb

@ -66,6 +66,8 @@ public class OutsourcingFileWriter {
DataObject dataObject = dataObjectList.get(i); DataObject dataObject = dataObjectList.get(i);
CmmnUtil.setOcrInfo(dataObject); CmmnUtil.setOcrInfo(dataObject);
CmmnUtil.setBarcode(dataObject);
String sndngDtlId = dataObject.string("SNDNG_DTL_ID");
int crdnPhotoCnt = dataObject.number("CRDN_PHOTO_CNT").intValue(); int crdnPhotoCnt = dataObject.number("CRDN_PHOTO_CNT").intValue();
@ -87,7 +89,7 @@ public class OutsourcingFileWriter {
} }
InputStream orgnFileInputStream = new FileInputStream(orgnFile); InputStream orgnFileInputStream = new FileInputStream(orgnFile);
String modifiedFileName = "P"+fileKey+CmmnUtil.indexToAlphabet(j, true, true)+"."+"JPG"; String modifiedFileName = "P"+sndngDtlId+CmmnUtil.indexToAlphabet(j, true, true)+"."+"JPG";
String modifiedFilePath = imagesFolderPath + File.separator + modifiedFileName; String modifiedFilePath = imagesFolderPath + File.separator + modifiedFileName;

@ -508,6 +508,26 @@ public class CmmnUtil {
} }
public static String getBarcode(String rgSe, String sggCd, String sndngDtlId) {
String rgSe1 = "";
if(rgSe.length() > 1) {
rgSe1 = rgSe.substring(1);
} else {
rgSe1 = rgSe;
}
return "*"+rgSe1+sggCd+sndngDtlId+"*";
}
public static void setBarcode(DataObject dataObject) {
String recevDivCd = dataObject.string("RECEV_DIV_CD");
String sggCd = dataObject.string("SGG_CD");
String sndngDtlId = dataObject.string("SNDNG_DTL_ID");
String barcode = CmmnUtil.getBarcode(recevDivCd, sggCd, sndngDtlId);
dataObject.put("BARCODE", barcode);
dataObject.put("BARCODE1", barcode);
}
/** /**
* @param xlsx * @param xlsx
* @return XLSWriter.Styler * @return XLSWriter.Styler

@ -23,8 +23,6 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import cokr.xit.foundation.AbstractComponent;
import cokr.xit.foundation.data.DataObject;
import cokr.xit.base.user.service.bean.UserBean; import cokr.xit.base.user.service.bean.UserBean;
import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.Crdn;
import cokr.xit.fims.crdn.dao.CrdnUpdtMapper; import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
@ -38,6 +36,8 @@ import cokr.xit.fims.nxrp.dao.NisIndivA03Mapper;
import cokr.xit.fims.sndb.SndbQuery; import cokr.xit.fims.sndb.SndbQuery;
import cokr.xit.fims.sndb.SndngDtl; import cokr.xit.fims.sndb.SndngDtl;
import cokr.xit.fims.sndb.dao.SndngDtlMapper; import cokr.xit.fims.sndb.dao.SndngDtlMapper;
import cokr.xit.foundation.AbstractComponent;
import cokr.xit.foundation.data.DataObject;
/** Bean /** Bean
* *
@ -145,7 +145,7 @@ public class NisIndivBean extends AbstractComponent {
nisIndivA01.setRprsTxmCd(selectCrdnInfo.string("TXITM_CD")); // 대표세입과목코드 nisIndivA01.setRprsTxmCd(selectCrdnInfo.string("TXITM_CD")); // 대표세입과목코드
nisIndivA01.setOperItemCd(selectCrdnInfo.string("OPER_ITEM_CD")); // 운영항목코드 nisIndivA01.setOperItemCd(selectCrdnInfo.string("OPER_ITEM_CD")); // 운영항목코드
// 과태료과징금구분코드 01:과태료 02:과징금 // 과태료과징금구분코드 01:과태료 02:과징금
if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차는 과금(02) if (selectCrdnInfo.string("TASK_SE_CD").equals("PES")) { // 밤샘주차는 과금(02)
nisIndivA01.setFinScrgSeCd("02"); nisIndivA01.setFinScrgSeCd("02");
} else { } else {
nisIndivA01.setFinScrgSeCd("01"); nisIndivA01.setFinScrgSeCd("01");
@ -513,6 +513,7 @@ public class NisIndivBean extends AbstractComponent {
// SSL 무시 ///////////////////////////////////////////////////////////////// // SSL 무시 /////////////////////////////////////////////////////////////////
public void ignoreSsl() throws Exception { public void ignoreSsl() throws Exception {
HostnameVerifier hv = new HostnameVerifier() { HostnameVerifier hv = new HostnameVerifier() {
@Override
public boolean verify(String urlHostName, SSLSession session) { public boolean verify(String urlHostName, SSLSession session) {
return true; return true;
} }
@ -532,6 +533,7 @@ public class NisIndivBean extends AbstractComponent {
} }
static class miTM implements TrustManager,X509TrustManager { static class miTM implements TrustManager,X509TrustManager {
@Override
public X509Certificate[] getAcceptedIssuers() { public X509Certificate[] getAcceptedIssuers() {
return null; return null;
} }
@ -544,11 +546,13 @@ public class NisIndivBean extends AbstractComponent {
return true; return true;
} }
@Override
public void checkServerTrusted(X509Certificate[] certs, String authType) public void checkServerTrusted(X509Certificate[] certs, String authType)
throws CertificateException { throws CertificateException {
return; return;
} }
@Override
public void checkClientTrusted(X509Certificate[] certs, String authType) public void checkClientTrusted(X509Certificate[] certs, String authType)
throws CertificateException { throws CertificateException {
return; return;

Loading…
Cancel
Save