调试上海接口，调整对应字段

czt

2024-11-26 58c47f9f7fdd6e6991db9b43607e36d2175c35ad

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -50,6 +50,8 @@
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api9110Rep api9110Rep;
    @Autowired
    private Api1103Rep api1103Rep;
    @Autowired
    private Api1104Rep api1104Rep;
@@ -84,8 +86,17 @@
    public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {

        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);
@@ -106,7 +117,7 @@
            //获取接口编码
            String inteId = this.getInteId(param.getInteId());
            //获取JSON报文
            String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
            String jsonData = getJsonData(param.getInteId(), data, xzqhdm);
            log.info("接口数据信息=" + jsonData);
            apiLog.setData(jsonData);
            apiLog.setKqdm(kqdm);
@@ -662,11 +673,11 @@
            //质检单号
            List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02");
            if (null != api1310List && api1310List.size() > 0) {
                api1205.setZjbgdh(apiData.getHwdm() + api1310List.get(0).getZjbgdh());
                api1205.setZjbgdh(api1310List.get(0).getZjbgdh());
            }
            //生成方式
            if(null == api1205.getScfs()){
                api1205.setScfs(1);
                api1205.setScfs("1");
            }
            if(StringUtils.isEmpty(api1205.getSdblyy())){
                api1205.setSdblyy("流程生成无补录原因");
@@ -799,6 +810,8 @@
            if(api1209.getRksl() < api1209.getRkjz()){
                api1209.setRksl(api1209.getRkjz());
            }
            api1209.setCqqrbs(apiData.getCqqrbs() + "");
            api1209.setSfch(apiData.getSfch() + "");
            //设置空属性为默认值
            changeObject(api1209);
            return api1209;
@@ -1269,33 +1282,71 @@
            return apiData;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {
            Api1505 api1505 = (Api1505)data;
            SH2023Api1505 apiData = new SH2023Api1505();
            BeanUtils.copyProperties(data, apiData);
            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(data, apiData);
            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(data, apiData);
            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(data, apiData);
            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(data, apiData);
            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(data, apiData);
            BeanUtils.copyProperties(api1510, apiData);
            apiData.setPeriod(api1510.getPeriod() + "");
            apiData.setAcctyear(api1510.getAcctyear() + "");
            return apiData;
        }
        //设置空属性为默认值
@@ -1810,15 +1861,15 @@
        }
        //粮食入库信息数据接口
        if (Constant.API_CODE_9114.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3106;
            return SH2023Constant.SH_2023_API_CODE_3201;
        }
        //来粮检验信息数据接口
        if (Constant.API_CODE_9115.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3107;
            return SH2023Constant.SH_2023_API_CODE_3202;
        }
        //粮食收购基础信息数据接口
        if (Constant.API_CODE_9116.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_3108;
            return SH2023Constant.SH_2023_API_CODE_3203;
        }
        if (Constant.API_CODE_1501.equals(inteId)) {
            return SH2023Constant.SH_2023_API_CODE_1114;