fix: NIMS 폐기보고 확인

- 상품 일련번호 정보중 null로 return 되는 항목이 있어
       일치 비교시 null 여부에 관계 없이 처리하기 위해
       Objects.equals() 사용
dev
Jonguk. Lim 4 months ago
parent d9ef120053
commit 59785ae458

@ -3,6 +3,7 @@ package cokr.xit.adds.inf.nims.model;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import javax.validation.Valid; import javax.validation.Valid;
@ -489,11 +490,11 @@ public class NimsApiDto {
if (this.listDtl.size() == mgtDto.getDsuseMgtDtls().size()) { if (this.listDtl.size() == mgtDto.getDsuseMgtDtls().size()) {
for (DsuseRptInfoDtl rptDtl : this.listDtl) { for (DsuseRptInfoDtl rptDtl : this.listDtl) {
for (BizNimsDto.DsuseMgtDtl mgtDtl : mgtDto.getDsuseMgtDtls()) { for (BizNimsDto.DsuseMgtDtl mgtDtl : mgtDto.getDsuseMgtDtls()) {
if (rptDtl.getPrductCd().equals(mgtDtl.getPrductCd()) if (Objects.equals(rptDtl.getPrductCd(), mgtDtl.getPrductCd())
&& rptDtl.getMnfNo().equals(mgtDtl.getMnfNo()) && Objects.equals(rptDtl.getMnfNo(), mgtDtl.getMnfNo())
&& rptDtl.getPrdValidDe().equals(mgtDtl.getPrdValidDe()) && Objects.equals(rptDtl.getPrdValidDe(), mgtDtl.getPrdValidDe())
&& rptDtl.getMnfSeq().equals(mgtDtl.getMnfSeq()) && Objects.equals(rptDtl.getMnfSeq(), mgtDtl.getMnfSeq())
&& rptDtl.getDsuseQy().equals(mgtDtl.getDsuseQy())) { && Objects.equals(rptDtl.getDsuseQy(), mgtDtl.getDsuseQy())) {
rptDtl.setMatchYn("Y"); rptDtl.setMatchYn("Y");
break; break;
} }

@ -6,6 +6,17 @@ alter table tb_dsuse_mgt
alter table tb_dsuse_mgt alter table tb_dsuse_mgt
add dsuse_acdt_de varchar(8) null comment '사고발생일' after dsuse_de; add dsuse_acdt_de varchar(8) null comment '사고발생일' after dsuse_de;
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('anonymousAction', '/adds/nims/getNimsBsshInfoSt.do', '20240612183715', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('anonymousAction', '/adds/nims/getNimsProductInfoKdAndMnfSeqInfo.do', '20240612183715', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsBsshInfoSt.do', '20240612183715', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsProductInfoKd.do', '20240705161322', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsProductInfoKdAndMnfSeqInfo.do', '20240705161322', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('managerAciton', '/adds/nims/getNimsProductSeqInfo.do', '20240705161322', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsBsshInfoSt.do', '20240612183715', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsProductInfoKd.do', '20240705161335', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsProductInfoKdAndMnfSeqInfo.do', '20240612183715', '0000000000');
INSERT INTO tb_grp_action (GRP_ID, ACTION, REG_DT, RGTR) VALUES ('userAction', '/adds/nims/getNimsProductSeqInfo.do', '20240705161335', '0000000000');
create or replace table tb_dsuse_rslt_img create or replace table tb_dsuse_rslt_img
( (
dscdmng_rslt_img_id varchar(12) not null comment '폐기관리_결과_이미지_id', dscdmng_rslt_img_id varchar(12) not null comment '폐기관리_결과_이미지_id',

Loading…
Cancel
Save