上海省平台协议-增加数据相符性接口

czt

2024-06-28 54b61daf58037385cb8d46404b12a95786c7c8f3

 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,7 +11,6 @@
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.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -20,7 +20,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.lang.reflect.Field;
import java.util.*;

@@ -92,10 +91,10 @@
            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;
            if (Constant.API_CODE_1114_1501.equals(param.getInteId())
                    || Constant.API_CODE_1114_1502.equals(param.getInteId())
                    || Constant.API_CODE_1114_1503.equals(param.getInteId())) {
                inteId = Constant.API_CODE_1114;
            }
            apiLog.setInteId(inteId);

@@ -123,8 +122,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 +138,7 @@
            //获取身份ID，即行政区划码
            reqData.setUid(conf.getUserName());
            //指令id
            reqData.setOrderid(orderData.getOrderid());
            reqData.setOrderid(orderId);

            //身份签名，使用自有RSA私钥进行加密(地区行政区划代码_当天日期)
            reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
@@ -337,6 +336,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 +350,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 +365,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 +387,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 +405,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 +421,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 +440,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())) {
@@ -437,6 +490,11 @@
            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);
            }
            api1202.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1202.getCddm())) {
                api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -479,6 +537,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");
            }
@@ -513,7 +576,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 +608,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));
@@ -579,6 +650,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());
@@ -607,6 +683,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) {
@@ -624,6 +710,16 @@
            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())) {
@@ -655,7 +751,11 @@
            if (null != api1208List && api1208List.size() > 0) {
                api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
            }

            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1209.getTyhwbm())){
                String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
                api1209.setTyhwbm(tyhwbm);
            }
            //粮食性质,暂时默认区级储备
            api1209.setLsxzdm("122");

@@ -669,6 +769,11 @@

            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());
@@ -703,6 +808,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) {
@@ -710,6 +820,11 @@
            }
            //主管粮库代码
            api1211.setZglkdm(apiData.getKqdm());
            //校验统一编码是否为空，为空则查询信息进行赋值
            if(StringUtils.isEmpty(api1211.getZglktybm())){
                String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
                api1211.setZglktybm(zglktybm);
            }
            //设置空属性为默认值
            changeObject(api1211);
            return api1211;
@@ -718,7 +833,16 @@
            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;
@@ -727,7 +851,11 @@
            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;
@@ -737,6 +865,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());
@@ -755,6 +888,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());
@@ -768,6 +906,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());
@@ -783,6 +926,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));
@@ -799,6 +947,11 @@
            BeanUtils.copyProperties(apiData, api1306);
            api1306.setBjw(ShAreaBjw.getBjw(code));
            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());
            //设置批次号
@@ -819,7 +972,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;
@@ -830,7 +997,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;
@@ -839,6 +1015,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;
@@ -849,7 +1030,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");
            }
@@ -892,7 +1077,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;
@@ -901,7 +1090,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;
@@ -924,7 +1117,11 @@
            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; //用于统计轮入数量和轮出数量
@@ -950,7 +1147,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;
@@ -967,6 +1168,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;
@@ -974,6 +1186,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;
@@ -1158,6 +1375,17 @@
        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());
@@ -1208,6 +1436,17 @@
        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());
@@ -1260,6 +1499,17 @@
        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());
@@ -1367,7 +1617,7 @@
    }
    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;