From 46ee5aac0c31c352f19344eb3cfd762817f2559e Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期五, 10 十月 2025 19:25:30 +0800 Subject: [PATCH] 优化上海接口日志打印 --- src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 707 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 619 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java index f146029..71f2008 100644 --- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java +++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java @@ -1,6 +1,7 @@ package com.fzzy.push.sh2023; import com.alibaba.fastjson.JSON; +import com.fzzy.api.Constant; import com.fzzy.api.data.ApiParam; import com.fzzy.api.data.PushProtocol; import com.fzzy.api.dto.ResponseDto; @@ -10,8 +11,10 @@ import com.fzzy.api.service.ApiTriggerService; import com.fzzy.api.utils.*; import com.fzzy.api.view.repository.*; -import com.fzzy.order.data.OrderData; +import com.fzzy.push.nx2023.NX2023Constant; import com.fzzy.push.sh2023.dto.*; +import com.fzzy.push.sx2024.SX2024Constant; +import com.fzzy.push.sx2024.data.*; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -48,6 +51,8 @@ @Autowired private Api1102Rep api1102Rep; @Autowired + private Api9110Rep api9110Rep; + @Autowired private Api1103Rep api1103Rep; @Autowired private Api1104Rep api1104Rep; @@ -61,6 +66,8 @@ private Api1202Rep api1202Rep; @Autowired private Api1205Rep api1205Rep; + @Autowired + private Api1310Rep api1310Rep; @Autowired private Api1403Rep api1403Rep; @Autowired @@ -78,10 +85,19 @@ @Override public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) { - String inteId = param.getInteId(); + String kqdm = param.getKqdm(); - //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮� - List<Api1102> api1102List = api1102Rep.findPushData(kqdm); + String xzqhdm = ""; + if (param.getInteId().startsWith("91")) { + //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮� + List<Api9110> api9110List = api9110Rep.findPushData(kqdm); + xzqhdm = api9110List.get(0).getXzqhdm(); + } else { + //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮� + List<Api1102> api1102List = api1102Rep.findPushData(kqdm); + xzqhdm = api1102List.get(0).getXzqhdm(); + } + try { if (null == conf) { conf = apiCommonService.getConf(kqdm); @@ -90,24 +106,19 @@ //娣诲姞鏃ュ織 ApiLog apiLog = new ApiLog(); apiLog.setId(ContextUtil.getUUID()); - - //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114 - if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId()) - || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId()) - || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) { - inteId = SH2023Constant.SH_2023_API_CODE_1114; - } - apiLog.setInteId(inteId); - - if (StringUtils.isEmpty(inteId)) { + if (StringUtils.isEmpty(param.getInteId())) { ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�"); apiLog.setStatus(99); apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�"); apiLogRep.save(apiLog); return responseDto; } + apiLog.setInteId(param.getInteId()); - String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm()); + //鑾峰彇鎺ュ彛缂栫爜 + String inteId = this.getInteId(param.getInteId()); + //鑾峰彇JSON鎶ユ枃 + String jsonData = getJsonData(param.getInteId(), data, xzqhdm); log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData); apiLog.setData(jsonData); apiLog.setKqdm(kqdm); @@ -123,8 +134,8 @@ //鑾峰彇鎸囦护id String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm()); - OrderData orderData = (OrderData) redisUtil.get(key); - if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) { + String orderId = (String) redisUtil.get(key); + if (StringUtils.isEmpty(orderId)) { log.error("鎸囦护id澶辨晥=" + jsonData); ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥"); apiLog.setStatus(99); @@ -139,7 +150,7 @@ //鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮� reqData.setUid(conf.getUserName()); //鎸囦护id - reqData.setOrderid(orderData.getOrderid()); + reqData.setOrderid(orderId); //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠g爜_褰撳ぉ鏃ユ湡) reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword())); @@ -149,7 +160,7 @@ reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey())); //鎽樿锛屾暟鎹富浣撶殑MD5鍊� reqData.setDigst(MyMD5Util.encrypt(jsonData)); - log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData)); + log.debug("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData)); SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf); apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode()); @@ -198,7 +209,8 @@ } //灏佽鏁版嵁 - SH2023PullReqDto reqData = new SH2023PullReqDto();; + SH2023PullReqDto reqData = new SH2023PullReqDto(); + ; reqData.setName(conf.getUserName()); reqData.setPwd(conf.getAppCode()); @@ -241,7 +253,7 @@ Object object = getJsonApiData(inteId, data, code); //闄ゅ簱瀛樻帴鍙e锛屽叾浠栨帴鍙d笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂� - if(!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)){ + if (!SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) { setZhgxsjValue(object); } @@ -337,6 +349,11 @@ SH2023Api1107 api1107 = new SH2023Api1107(); BeanUtils.copyProperties(data, api1107); api1107.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1107.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm()); + api1107.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1107); @@ -346,6 +363,11 @@ SH2023Api1108 api1108 = new SH2023Api1108(); BeanUtils.copyProperties(data, api1108); api1108.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1108.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm()); + api1108.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1108); @@ -356,6 +378,11 @@ Api1109 apiData = (Api1109) data; BeanUtils.copyProperties(apiData, api1109); api1109.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1109.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm()); + api1109.setTykqbm(tykqbm); + } Map<String, String> map = new HashMap<>(); map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz())); @@ -373,6 +400,12 @@ Api1110 apiData = (Api1110) data; BeanUtils.copyProperties(apiData, api1110); api1110.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1110.getTyajbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm()); + api1110.setTyajbm(tyhwbm); + } + api1110.setAjdm(apiData.getHwdm().substring(0, 28)); api1110.setAjxdwz(apiData.getHwxdwz()); api1110.setAjwzys(apiData.getHwwzys()); @@ -385,6 +418,11 @@ SH2023Api1111 api1111 = new SH2023Api1111(); BeanUtils.copyProperties(data, api1111); api1111.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1111.getTykqbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm()); + api1111.setTykqbm(tyhwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1111); @@ -396,6 +434,16 @@ api1112.setHdrychsj(api1112.getQdzgzchzyzgsj()); api1112.setBjw(ShAreaBjw.getBjw(code)); api1112.setZy("01"); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1112.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm()); + api1112.setTydwbm(tydwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1112.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm()); + api1112.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1112); @@ -405,15 +453,33 @@ SH2023Api1113 api1113 = new SH2023Api1113(); BeanUtils.copyProperties(data, api1113); api1113.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1113.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm()); + api1113.setTydwbm(tydwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1113); return api1113; + } + //鏁版嵁鐩哥鎬ф帴鍙� + if (SH2023Constant.SH_2023_API_CODE_1115.equals(inteId)) { + SH2023Api1115 api1115 = new SH2023Api1115(); + BeanUtils.copyProperties(data, api1115); + api1115.setBjw(ShAreaBjw.getBjw(code)); + //璁剧疆绌哄睘鎬т负榛樿鍊� + changeObject(api1115); + return api1115; } if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) { SH2023Api1201 api1201 = new SH2023Api1201(); BeanUtils.copyProperties(data, api1201); api1201.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1201.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm()); + api1201.setTydwbm(tydwbm); + } api1201.setHtsfzz("0"); //鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧~鏃� if (StringUtils.isEmpty(api1201.getQddd())) { @@ -425,8 +491,15 @@ } //璁剧疆璐攢鏂瑰紡,榛樿瀹㈡埛缁熶竴淇$敤鐮佷负绌猴紝鍒欎负浜ч攢锛屽弽涔嬩负绔炰环锛�(1-瀹氬悜锛�2-绔炰环锛�3-浜ч攢) api1201.setGxfs("2"); - if(StringUtils.isEmpty(api1201.getKhtyshxydm())){ + if (StringUtils.isEmpty(api1201.getKhtyshxydm())) { api1201.setGxfs("3"); + } + //浠樻鏂瑰紡 + if (StringUtils.isEmpty(api1201.getFkfs())) { + api1201.setFkfs("4"); + } + if (StringUtils.isEmpty(api1201.getYsfs())) { + api1201.setYsfs("鎸夊皝浠撴暟閲忚繘琛岄獙鏀�"); } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1201); @@ -437,6 +510,16 @@ Api1202 apiData = (Api1202) data; BeanUtils.copyProperties(apiData, api1202); api1202.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1202.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm()); + api1202.setTyhwbm(tyhwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1202.getLqgsdwtybm())) { + String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18)); + api1202.setLqgsdwtybm(tydwbm); + } api1202.setJzrq(apiData.getCmsj()); if (StringUtils.isEmpty(api1202.getCddm())) { api1202.setCddm(api1202.getHwdm().substring(2, 8)); @@ -447,12 +530,12 @@ //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒� List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh()); if (null != api1404List && api1404List.size() > 0) { - if(StringUtils.isEmpty(api1202.getShnd())){ + if (StringUtils.isEmpty(api1202.getShnd())) { api1202.setShnd(api1404List.get(0).getShnd()); } List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh()); - if(null != api1403List && api1403List.size() > 0){ - if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){ + if (null != api1403List && api1403List.size() > 0) { + if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) { api1202.setLhnd(api1403List.get(0).getJhnd()); } } @@ -469,7 +552,20 @@ } //绮鎬ц川 api1202.setLsxzdm("200"); - + //鍞伯浜轰俊鎭� + if (StringUtils.isEmpty(api1202.getSlr())) { + api1202.setSlr("鍞伯浜�"); + } + if (StringUtils.isEmpty(api1202.getSlrdz())) { + api1202.setSlrdz("鍞伯浜哄湴鍧�"); + } + //鐢熸垚鏂瑰紡 + if (null == api1202.getScfs()) { + api1202.setScfs("1"); + } + if (StringUtils.isEmpty(api1202.getSdblyy())) { + api1202.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�"); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1202); return api1202; @@ -479,6 +575,11 @@ Api1203 apiData = (Api1203) data; BeanUtils.copyProperties(apiData, api1203); api1203.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1203.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm()); + api1203.setTyhwbm(tyhwbm); + } if (StringUtils.isEmpty(api1203.getJyxm())) { api1203.setJyxm("0"); } @@ -500,7 +601,7 @@ api1203.setZjbh(api1203.getRkjydh()); List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh()); if (null != api1202List && api1202List.size() > 0) { - if(api1202List.get(0).getYsgj().equals("3")){ + if (api1202List.get(0).getYsgj().equals("3")) { api1203.setZjbh(api1202List.get(0).getBizId().substring(2)); } } @@ -513,7 +614,11 @@ Api1204 apiData = (Api1204) data; BeanUtils.copyProperties(apiData, api1204); api1204.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1204.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm()); + api1204.setTyhwbm(tyhwbm); + } //璁剧疆鎵规鍙� if (StringUtils.isNotEmpty(api1204.getHth())) { List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh()); @@ -541,7 +646,11 @@ Api1205 apiData = (Api1205) data; BeanUtils.copyProperties(apiData, api1205); api1205.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1205.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm()); + api1205.setTyhwbm(tyhwbm); + } api1205.setJzrq(apiData.getCmsj()); if (StringUtils.isEmpty(api1205.getCddm())) { api1205.setCddm(api1205.getHwdm().substring(2, 8)); @@ -553,12 +662,12 @@ //璁剧疆绮杞崲骞村害 List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh()); if (null != api1404List && api1404List.size() > 0) { - if(StringUtils.isEmpty(api1205.getShnd())){ + if (StringUtils.isEmpty(api1205.getShnd())) { api1205.setShnd(api1404List.get(0).getShnd()); } List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh()); - if(null != api1403List && api1403List.size() > 0){ - if(StringUtils.isNotEmpty(api1403List.get(0).getJhnd())){ + if (null != api1403List && api1403List.size() > 0) { + if (StringUtils.isNotEmpty(api1403List.get(0).getJhnd())) { api1205.setLhnd(api1403List.get(0).getJhnd()); } } @@ -569,7 +678,18 @@ if (null != api1208List && api1208List.size() > 0) { api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd()); } - + //璐ㄦ鍗曞彿 + List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02"); + if (null != api1310List && api1310List.size() > 0) { + api1205.setZjbgdh(api1310List.get(0).getZjbgdh()); + } + //鐢熸垚鏂瑰紡 + if (null == api1205.getScfs()) { + api1205.setScfs("1"); + } + if (StringUtils.isEmpty(api1205.getSdblyy())) { + api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�"); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1205); return api1205; @@ -579,6 +699,11 @@ Api1206 apiData = (Api1206) data; BeanUtils.copyProperties(apiData, api1206); api1206.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1206.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm()); + api1206.setTykqbm(tykqbm); + } //鎵规鍙� if (StringUtils.isNotEmpty(api1206.getHth())) { List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh()); @@ -587,6 +712,12 @@ if (null != api1208List && api1208List.size() > 0) { api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd()); } + } + } + if (StringUtils.isNotEmpty(apiData.getHwdm())) { + List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm()); + if (null != api1208List && api1208List.size() > 0) { + api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd()); } } //璁剧疆绌哄睘鎬т负榛樿鍊� @@ -601,6 +732,16 @@ api1207.setDcrq(apiData.getDcrq()); api1207.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1207.getDcdwtybm())) { + String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw()); + api1207.setDcdwtybm(dckqtybm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1207.getDchwtybm())) { + String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm()); + api1207.setDchwtybm(dchwtybm); + } List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm()); if (null != api1208List && api1208List.size() > 0) { @@ -618,17 +759,29 @@ api1208.setZglkdm(api1208.getHwdm().substring(0, 21)); api1208.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1208.getZglktybm())) { + String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm()); + api1208.setZglktybm(lqgstydwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1208.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm()); + api1208.setTyhwbm(tyhwbm); + } //璁剧疆鎵规鍙� api1208.setPch(apiData.getHwdm() + apiData.getShnd()); if (StringUtils.isEmpty(api1208.getCd())) { api1208.setCd(api1208.getHwdm().substring(2, 8)); } //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁� - if(null == apiData.getBclbs()){ - apiData.setBclbs(0); + if (null == apiData.getBclbs()) { + api1208.setBclbs(0); } - if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){ - apiData.setBclbs((int)(apiData.getSjsl()/25)); + if ("2".equals(apiData.getClfs())) { + api1208.setBclbs((int) (apiData.getSjsl() / 25)); + api1208.setCplgg(25); + api1208.setCplbs(api1208.getBclbs()); } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1208); @@ -648,11 +801,28 @@ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm()); if (null != api1208List && api1208List.size() > 0) { api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd()); + api1209.setLspzdm(api1208List.get(0).getLspzdm()); } - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1209.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm()); + api1209.setTyhwbm(tyhwbm); + } //绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ api1209.setLsxzdm("122"); + //鎹熺泭鐜妭锛岄粯璁ゅ嚭搴撴崯鑰� + if (StringUtils.isEmpty(api1209.getSyhj())) { + api1209.setSyhj("2"); + } + //鑾峰彇涓婃捣瑙勮寖鎹熺泭绫诲瀷 + api1209.setSylx(getShSylxByGb(api1209.getSylx())); + //鍏ュ簱鏁伴噺 + if (api1209.getRksl() < api1209.getRkjz()) { + api1209.setRksl(api1209.getRkjz()); + } + api1209.setCqqrbs(apiData.getCqqrbs() + ""); + api1209.setSfch(apiData.getSfch() + ""); //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1209); return api1209; @@ -663,21 +833,26 @@ BeanUtils.copyProperties(apiData, api1210); api1210.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1210.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm()); + api1210.setTyhwbm(tyhwbm); + } List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm()); if (null != api1208List && api1208List.size() > 0) { api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd()); } //鑻ヨ鍒掓槑缁嗗彿涓虹┖锛岃缃鍒掓槑缁嗗彿锛屾牴鎹垝杞�ц川鏌ヨ鍑哄叆搴撲俊鎭幏鍙栬鍒掑彿 - if(StringUtils.isEmpty(api1210.getJhmxdh())){ - if("200".equals(api1210.getHzqlsxzdm())){ + if (StringUtils.isEmpty(api1210.getJhmxdh())) { + if ("200".equals(api1210.getHzqlsxzdm())) { //鑻ュ垝杞墠鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍏ュ簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙� List<Api1202> api1202List = api1202Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq()); if (null != api1202List && api1202List.size() > 0) { api1210.setJhmxdh(api1202List.get(0).getJhmxh()); } } - if("200".equals(api1210.getHzhlsxzdm())){ + if ("200".equals(api1210.getHzhlsxzdm())) { //鑻ュ垝杞悗鎬ц川涓哄晢鍝佺伯锛屽垯鏌ヨ鍑哄簱淇℃伅鑾峰彇璁″垝鏄庣粏鍙� List<Api1205> api1205List = api1205Rep.getDataByHwdmAndTime(api1210.getHwdm(), api1210.getHzrq()); if (null != api1205List && api1205List.size() > 0) { @@ -697,6 +872,11 @@ BeanUtils.copyProperties(apiData, api1211); api1211.setZglkdm(api1211.getKqdm()); api1211.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1211.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm()); + api1211.setTyhwbm(tyhwbm); + } api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM")); List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm()); if (null != api1208List && api1208List.size() > 0) { @@ -704,24 +884,60 @@ } //涓荤绮簱浠g爜 api1211.setZglkdm(apiData.getKqdm()); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1211.getZglktybm())) { + String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm()); + api1211.setZglktybm(zglktybm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1211); + api1211.setYwksrq(api1211.getYwrq()); + if ("0".equals(api1211.getYjbz())) { + api1211.setYwksrq(DateUtil.getMonthFirst(api1211.getYwrq())); + } return api1211; } if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) { SH2023Api1212 api1212 = new SH2023Api1212(); BeanUtils.copyProperties(data, api1212); api1212.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1212.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm()); + api1212.setTydwbm(tydwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1212.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm()); + api1212.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1212); return api1212; + } + if (SH2023Constant.SH_2023_API_CODE_1213.equals(inteId)) { + Api1213 api1213 = (Api1213) data; + SH2023Api1213 apiData = new SH2023Api1213(); + BeanUtils.copyProperties(api1213, apiData); + apiData.setBjw(ShAreaBjw.getBjw(code)); + //璁剧疆鎵规鍙� + apiData.setPch(apiData.getHwdm() + apiData.getShnd()); + //璁剧疆绲变竴璐т綅缂栫爜 + if (StringUtils.isEmpty(apiData.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1213.getHwdm()); + apiData.setTyhwbm(tyhwbm); + } + return apiData; } if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) { SH2023Api1301 api1301 = new SH2023Api1301(); BeanUtils.copyProperties(data, api1301); api1301.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1301.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm()); + api1301.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1301); return api1301; @@ -731,6 +947,11 @@ Api1302 apiData = (Api1302) data; BeanUtils.copyProperties(apiData, api1302); api1302.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1302.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm()); + api1302.setTyhwbm(tyhwbm); + } api1302.setLqjs("1"); //鎵规鍙� List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm()); @@ -749,6 +970,11 @@ Api1303 apiData = (Api1303) data; BeanUtils.copyProperties(apiData, api1303); api1303.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1303.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm()); + api1303.setTyhwbm(tyhwbm); + } List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm()); if (null != api1208List && api1208List.size() > 0) { api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd()); @@ -762,6 +988,11 @@ Api1304 apiData = (Api1304) data; BeanUtils.copyProperties(apiData, api1304); api1304.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1304.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm()); + api1304.setTyhwbm(tyhwbm); + } List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm()); if (null != api1208List && api1208List.size() > 0) { api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd()); @@ -777,6 +1008,11 @@ BeanUtils.copyProperties(apiData, api1305); api1305.setBjw(ShAreaBjw.getBjw(code)); api1305.setAjdm(apiData.getTfzydh().substring(0, 28)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1305.getTyajbm())) { + String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm()); + api1305.setTyajbm(tyajbm); + } //涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿 api1305.setAjdm(apiData.getTfzydh().substring(0, 28)); api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30)); @@ -792,10 +1028,19 @@ Api1306 apiData = (Api1306) data; BeanUtils.copyProperties(apiData, api1306); api1306.setBjw(ShAreaBjw.getBjw(code)); - api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy")); api1306.setAjdm(apiData.getHwdm().substring(0, 28)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1306.getTyajbm())) { + String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm()); + api1306.setTyajbm(tyajbm); + } //涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿 api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId()); + //璁剧疆鎵规鍙� + List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm()); + if (null != api1208List && api1208List.size() > 0) { + api1306.setPch(apiData.getHwdm() + api1208List.get(0).getShnd()); + } if (StringUtils.isEmpty(api1306.getSyff())) { api1306.setSyff("0"); //娼В娉� } @@ -809,7 +1054,21 @@ BeanUtils.copyProperties(apiData, api1307); api1307.setBjw(ShAreaBjw.getBjw(code)); api1307.setAjdm(apiData.getHwdm().substring(0, 28)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1307.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm()); + api1307.setTykqbm(tykqbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1307.getTyajbm())) { + String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm()); + api1307.setTyajbm(tyajbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1307.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm()); + api1307.setTyhwbm(tyhwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1307); return api1307; @@ -820,7 +1079,16 @@ BeanUtils.copyProperties(apiData, api1308); api1308.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1308.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm()); + api1308.setTykqbm(tykqbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1308.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm()); + api1308.setTyhwbm(tyhwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1308); return api1308; @@ -829,6 +1097,11 @@ SH2023Api1309 api1309 = new SH2023Api1309(); BeanUtils.copyProperties(data, api1309); api1309.setBjw(ShAreaBjw.getBjw(code)); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1309.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1309.getQydm()); + api1309.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1309); return api1309; @@ -839,7 +1112,11 @@ BeanUtils.copyProperties(apiData, api1310); api1310.setBjw(ShAreaBjw.getBjw(code)); api1310.setJyrq(apiData.getJysj()); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1310.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm()); + api1310.setTyhwbm(tyhwbm); + } if (StringUtils.isEmpty(api1310.getJyxm())) { api1310.setJyxm("0"); } @@ -882,7 +1159,11 @@ SH2023Api1311 api1311 = new SH2023Api1311(); BeanUtils.copyProperties(data, api1311); api1311.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1311.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm()); + api1311.setTykqbm(tykqbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1311); return api1311; @@ -891,7 +1172,11 @@ SH2023Api1401 api1401 = new SH2023Api1401(); BeanUtils.copyProperties(data, api1401); api1401.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1401.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy()); + api1401.setTydwbm(tydwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1401); return api1401; @@ -914,16 +1199,20 @@ api1403.setJhzxdw(api1101List.get(0).getDwdm()); api1403.setJhzxdwmc(api1101List.get(0).getDwmc()); api1403.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1403.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(api1403.getJhzxdw()); + api1403.setTydwbm(tydwbm); + } //鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺 List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh()); Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲� - if(null != list && list.size() > 0){ + if (null != list && list.size() > 0) { for (Api1404 api1404 : list) { - if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){ + if (null != api1404.getLhlx() && "2".equals(api1404.getLhlx())) { lrsl += api1404.getLhsl(); } - if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){ + if (null != api1404.getLhlx() && "1".equals(api1404.getLhlx())) { lcsl += api1404.getLhsl(); } } @@ -940,7 +1229,11 @@ BeanUtils.copyProperties(data, api1404); api1404.setMxzt("1"); api1404.setBjw(ShAreaBjw.getBjw(code)); - + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(api1404.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm()); + api1404.setTyhwbm(tyhwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(api1404); return api1404; @@ -957,6 +1250,17 @@ if (null != api1208List && api1208List.size() > 0) { apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd()); } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(apiData.getDrdwtybm())) { + String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw()); + apiData.setDrdwtybm(drkqtybm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(apiData.getDrhwtybm())) { + String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm()); + apiData.setDrhwtybm(drhwtybm); + } + //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(apiData); return apiData; @@ -964,6 +1268,11 @@ if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) { SH2023Api2103 apiData = new SH2023Api2103(); BeanUtils.copyProperties(data, apiData); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(apiData.getTyhwbm())) { + String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm()); + apiData.setTyhwbm(tyhwbm); + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(apiData); return apiData; @@ -984,6 +1293,80 @@ changeObject(data); return data; } + if (Constant.API_CODE_1504.equals(inteId)) { + Api1504 api1504 = (Api1504) data; + SH2023Api1504 apiData = new SH2023Api1504(); + BeanUtils.copyProperties(api1504, apiData); + return apiData; + } + if (Constant.API_CODE_1505.equals(inteId)) { + Api1505 api1505 = (Api1505) data; + SH2023Api1505 apiData = new SH2023Api1505(); + BeanUtils.copyProperties(api1505, apiData); + apiData.setCqunit(api1505.getCqunit() + ""); + apiData.setCyear(api1505.getCyear() + ""); + apiData.setCdc(api1505.getCdc() + ""); + apiData.setBl(api1505.getBl() + ""); + apiData.setNgrade(api1505.getNgrade() + ""); + apiData.setBq(api1505.getBq() + ""); + apiData.setCqunit(api1505.getCqunit() + ""); + apiData.setBcash(api1505.getBcash() + ""); + apiData.setBbank(api1505.getBbank() + ""); + apiData.setBxjll(api1505.getBxjll() + ""); + apiData.setBf(api1505.getBf() + ""); + return apiData; + } + if (Constant.API_CODE_1506.equals(inteId)) { + Api1506 api1506 = (Api1506) data; + SH2023Api1506 apiData = new SH2023Api1506(); + BeanUtils.copyProperties(api1506, apiData); + apiData.setCyear(api1506.getCyear() + ""); + apiData.setNno(api1506.getNno() + ""); + apiData.setCdc(api1506.getCdc() + ""); + return apiData; + } + if (Constant.API_CODE_1507.equals(inteId)) { + Api1507 api1507 = (Api1507) data; + SH2023Api1507 apiData = new SH2023Api1507(); + BeanUtils.copyProperties(api1507, apiData); + apiData.setCmon(api1507.getCmon() + ""); + apiData.setCyear(api1507.getCyear() + ""); + apiData.setNvno(api1507.getNvno() + ""); + apiData.setNno(api1507.getNno() + ""); + apiData.setCdc(api1507.getCdc() + ""); + apiData.setBpt(api1507.getBpt() + ""); + apiData.setNanum(api1507.getNanum() + ""); + apiData.setBtmp(api1507.getBtmp() + ""); + return apiData; + } + if (Constant.API_CODE_1508.equals(inteId)) { + Api1508 api1508 = (Api1508) data; + SH2023Api1508 apiData = new SH2023Api1508(); + BeanUtils.copyProperties(api1508, apiData); + apiData.setCmon(api1508.getCmon() + ""); + apiData.setCyear(api1508.getCyear() + ""); + apiData.setNvno(api1508.getNvno() + ""); + apiData.setNrowno(api1508.getNrowno() + ""); + apiData.setCdc(api1508.getCdc() + ""); + return apiData; + } + if (Constant.API_CODE_1509.equals(inteId)) { + Api1509 api1509 = (Api1509) data; + SH2023Api1509 apiData = new SH2023Api1509(); + BeanUtils.copyProperties(api1509, apiData); + apiData.setDeprmethodid(api1509.getDeprmethodid() + ""); + apiData.setSourceid(api1509.getSourceid() + ""); + apiData.setUsingperiods(api1509.getUsingperiods() + ""); + return apiData; + } + if (Constant.API_CODE_1510.equals(inteId)) { + Api1510 api1510 = (Api1510) data; + SH2023Api1510 apiData = new SH2023Api1510(); + BeanUtils.copyProperties(api1510, apiData); + apiData.setPeriod(api1510.getPeriod() + ""); + apiData.setAcctyear(api1510.getAcctyear() + ""); + return apiData; + } //璁剧疆绌哄睘鎬т负榛樿鍊� changeObject(data); return data; @@ -991,6 +1374,7 @@ /** * 璧嬪�兼渶鍚庢洿鏂版椂闂� + * * @param object * @return */ @@ -1038,7 +1422,7 @@ map.put(ceng, new ArrayList<>()); } map.get(ceng).add(Double.valueOf(grain[0])); - lwmx += grain[2] + ":" + grain[3] +":" + grain[1] + "$" + grain[0]; + lwmx += grain[2] + ":" + grain[3] + ":" + grain[1] + "$" + grain[0]; if (Double.valueOf(grain[0]) <= -100) { lwmx += "$" + "1" + "#"; errorNum++; @@ -1068,7 +1452,7 @@ tempL = null; tempA = 0.0; for (Double point : payPoints) { - if(point > -100){ + if (point > -100) { sum += point; num++; if (tempH == null) { @@ -1148,21 +1532,32 @@ List<SHFinanceDto> list = new ArrayList<>(); SHFinanceDto shFinanceDto = new SHFinanceDto(); shFinanceDto.setDwdm(api1503.getDwdm()); + shFinanceDto.setKqdm(api1503.getKqdm()); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm()); + shFinanceDto.setTydwbm(tydwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm()); + shFinanceDto.setTykqbm(tykqbm); + } shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd")); shFinanceDto.setBbm("03"); shFinanceDto.setCzbz(api1503.getCzbz()); shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); - paddingData(shFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t"); - paddingData(shFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + ""); - paddingData(shFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + ""); - paddingData(shFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + ""); - paddingData(shFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + ""); - paddingData(shFinanceDto, list, "5", "绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + ""); - paddingData(shFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + ""); - paddingData(shFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + ""); - paddingData(shFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + ""); - paddingData(shFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + ""); + paddingData(shFinanceDto, list, "0", "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t"); + paddingData(shFinanceDto, list, "1", "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + ""); + paddingData(shFinanceDto, list, "2", "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + ""); + paddingData(shFinanceDto, list, "3", "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + ""); + paddingData(shFinanceDto, list, "4", "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + ""); + paddingData(shFinanceDto, list, "5", "绠$悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + ""); + paddingData(shFinanceDto, list, "6", "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + ""); + paddingData(shFinanceDto, list, "7", "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + ""); + paddingData(shFinanceDto, list, "8", "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + ""); + paddingData(shFinanceDto, list, "9", "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + ""); paddingData(shFinanceDto, list, "10", "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + ""); paddingData(shFinanceDto, list, "11", "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + ""); paddingData(shFinanceDto, list, "12", "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + ""); @@ -1198,21 +1593,32 @@ List<SHFinanceDto> list = new ArrayList<>(); SHFinanceDto shFinanceDto = new SHFinanceDto(); shFinanceDto.setDwdm(api1502.getDwdm()); + shFinanceDto.setKqdm(api1502.getKqdm()); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm()); + shFinanceDto.setTydwbm(tydwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm()); + shFinanceDto.setTykqbm(tykqbm); + } shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd")); shFinanceDto.setBbm("02"); shFinanceDto.setCzbz(api1502.getCzbz()); shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); - paddingData(shFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t"); - paddingData(shFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + ""); - paddingData(shFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + ""); - paddingData(shFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + ""); - paddingData(shFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + ""); - paddingData(shFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + ""); - paddingData(shFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + ""); - paddingData(shFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + ""); - paddingData(shFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + ""); - paddingData(shFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + ""); + paddingData(shFinanceDto, list, "0", "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t"); + paddingData(shFinanceDto, list, "1", "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + ""); + paddingData(shFinanceDto, list, "2", "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + ""); + paddingData(shFinanceDto, list, "3", "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + ""); + paddingData(shFinanceDto, list, "4", "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + ""); + paddingData(shFinanceDto, list, "5", "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + ""); + paddingData(shFinanceDto, list, "6", "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + ""); + paddingData(shFinanceDto, list, "7", "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + ""); + paddingData(shFinanceDto, list, "8", "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + ""); + paddingData(shFinanceDto, list, "9", "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + ""); paddingData(shFinanceDto, list, "10", "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + ""); paddingData(shFinanceDto, list, "11", "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + ""); paddingData(shFinanceDto, list, "12", "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + ""); @@ -1250,21 +1656,32 @@ List<SHFinanceDto> list = new ArrayList<>(); SHFinanceDto shFinanceDto = new SHFinanceDto(); shFinanceDto.setDwdm(api1501.getDwdm()); + shFinanceDto.setKqdm(api1501.getKqdm()); + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(shFinanceDto.getTydwbm())) { + String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm()); + shFinanceDto.setTydwbm(tydwbm); + } + //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪�� + if (StringUtils.isEmpty(shFinanceDto.getTykqbm())) { + String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm()); + shFinanceDto.setTykqbm(tykqbm); + } shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd")); shFinanceDto.setBbm("01"); shFinanceDto.setCzbz(api1501.getCzbz()); shFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); - paddingData(shFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t"); - paddingData(shFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + ""); - paddingData(shFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + ""); - paddingData(shFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + ""); - paddingData(shFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + ""); - paddingData(shFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + ""); - paddingData(shFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + ""); - paddingData(shFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + ""); - paddingData(shFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + ""); - paddingData(shFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + ""); + paddingData(shFinanceDto, list, "0", "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t"); + paddingData(shFinanceDto, list, "1", "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + ""); + paddingData(shFinanceDto, list, "2", "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + ""); + paddingData(shFinanceDto, list, "3", "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + ""); + paddingData(shFinanceDto, list, "4", "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + ""); + paddingData(shFinanceDto, list, "5", "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + ""); + paddingData(shFinanceDto, list, "6", "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + ""); + paddingData(shFinanceDto, list, "7", "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + ""); + paddingData(shFinanceDto, list, "8", "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + ""); + paddingData(shFinanceDto, list, "9", "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + ""); paddingData(shFinanceDto, list, "10", "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + ""); paddingData(shFinanceDto, list, "11", "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + ""); paddingData(shFinanceDto, list, "12", "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + ""); @@ -1355,9 +1772,10 @@ } return wjmc; } + private String getYwdh(String wjlx, String wjmc, String ywdh) { String[] s = wjmc.split("_"); - if ("2".equals(wjlx) || "3".equals(wjlx)) { + if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) { ywdh = s[1]; } return ywdh; @@ -1392,4 +1810,117 @@ return object; } + private String getShSylxByGb(String gbSylx) { + if ("1".equals(gbSylx)) { + return "2"; + } + if ("2".equals(gbSylx)) { + return "1"; + } + return gbSylx; + } + + /** + * 鏍规嵁鎺ュ彛缂栫爜鑾峰彇瀵瑰簲鐨勬帴鍙f暟鎹簱琛ㄥ悕 + * + * @param inteId + * @return + */ + private String getInteId(String inteId) { + //鏁版嵁鐩哥鎬� + if (Constant.API_CODE_9101.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1115; + } + //瑙嗛鐩戞帶鎺ュ彛 + if (Constant.API_CODE_9102.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1311; + } + //鍊掍粨鍊掑叆鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9103.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_2102; + } + //绮儏璁惧閰嶇疆鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9104.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_2103; + } + //妫�鏂ゅ崟鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9105.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_2101; + } + //甯傚偍椹宠繍鍗曚俊鎭暟鎹帴鍙� + if (Constant.API_CODE_9106.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_2104; + } + //浜ゆ槗涓績鍚堝悓淇″績鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9107.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_2203; + } + //瀹氬寲姘存楠屾帴鍙� + if (Constant.API_CODE_9108.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_2204; + } + //鍗曚綅淇℃伅鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9109.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3101; + } + //鏀剁撼搴撲俊鎭暟鎹帴鍙� + if (Constant.API_CODE_9110.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3102; + } + //浠撴埧淇℃伅鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9111.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3103; + } + //寤掗棿淇℃伅鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9112.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3104; + } + //璐т綅淇℃伅鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9113.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3105; + } + //绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9114.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3201; + } + //鏉ョ伯妫�楠屼俊鎭暟鎹帴鍙� + if (Constant.API_CODE_9115.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3202; + } + //绮鏀惰喘鍩虹淇℃伅鏁版嵁鎺ュ彛 + if (Constant.API_CODE_9116.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_3203; + } + if (Constant.API_CODE_1501.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1114; + } + if (Constant.API_CODE_1502.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1114; + } + if (Constant.API_CODE_1503.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1114; + } + if (Constant.API_CODE_1504.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1116; + } + if (Constant.API_CODE_1505.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1117; + } + if (Constant.API_CODE_1506.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1118; + } + if (Constant.API_CODE_1507.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1119; + } + if (Constant.API_CODE_1508.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1120; + } + if (Constant.API_CODE_1509.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1121; + } + if (Constant.API_CODE_1510.equals(inteId)) { + return SH2023Constant.SH_2023_API_CODE_1122; + } + return inteId; + } } \ No newline at end of file -- Gitblit v1.9.3