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

czt

2024-11-26 58c47f9f7fdd6e6991db9b43607e36d2175c35ad

 src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java

@@ -11,6 +11,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;

@@ -25,6 +26,7 @@
import org.springframework.stereotype.Service;

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

/**
@@ -43,6 +45,8 @@
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private Api1208Rep api1208Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
@@ -246,7 +250,7 @@
            BeanUtils.copyProperties(data, apiData);
            //设置統一仓房编码
            if (StringUtils.isEmpty(apiData.getTycfbm())) {
                String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
                String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
                apiData.setTycfbm(tycfbm);
            }
            //设置統一廒间名称
@@ -553,7 +557,7 @@
            }
            //设置粮权单位統一编码
            if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
                String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
                apiData.setLqgstydwbm(tydwbm);
            }
            return apiData;
@@ -573,6 +577,15 @@
            }
            //实际损耗数量赋值
            apiData.setSjsysl(api1209.getJzsysl());

            //设置品种、性质、等级、年度
            List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
            if (null != api1208List && api1208List.size() > 0) {
                apiData.setLspzdm(api1208List.get(0).getLspzdm());
                apiData.setLsxzdm(api1208List.get(0).getLsxzdm());
                apiData.setLsdjdm(api1208List.get(0).getLsdjdm());
                apiData.setShnd(api1208List.get(0).getShnd());
            }
            return apiData;
        }
        if (Constant.API_CODE_1210.equals(inteId)) {
@@ -853,21 +866,13 @@
            Api1504 api1504 = (Api1504)data;
            SX2024Api1504 apiData = new SX2024Api1504();
            BeanUtils.copyProperties(api1504, apiData);
            //设置統一单位编码
            if (StringUtils.isEmpty(apiData.getXqydm())) {
                String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
                apiData.setXqydm(tydwbm);
            }
            //设置統一库区编码
            if (StringUtils.isEmpty(apiData.getXkqdm())) {
                String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
                apiData.setXkqdm(tykqbm);
            }
            return apiData;
        }
        if (Constant.API_CODE_1505.equals(inteId)) {
            Api1505 api1505 = (Api1505)data;
            SX2024Api1505 apiData = new SX2024Api1505();
            BeanUtils.copyProperties(data, apiData);
            BeanUtils.copyProperties(api1505, apiData);
            apiData.setCqunit(api1505.getCqunit() + "");
            return apiData;
        }
        if (Constant.API_CODE_1506.equals(inteId)) {