调整上海接口V3.1

czt

2024-12-10 f3e014988da194301c9c8fca2d77a93712c0fce6

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

@@ -23,6 +23,7 @@
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.*;

@@ -208,7 +209,8 @@
            }

            //封装数据
            SH2023PullReqDto reqData = new SH2023PullReqDto();;
            SH2023PullReqDto reqData = new SH2023PullReqDto();
            ;

            reqData.setName(conf.getUserName());
            reqData.setPwd(conf.getAppCode());
@@ -774,11 +776,14 @@
            }
            //包装储粮是，核查包存粮包数
            if(null == apiData.getBclbs()){
                apiData.setBclbs(0);
                api1208.setBclbs(0);
            }
            if("2".equals(apiData.getClfs()) && apiData.getBclbs() == 0){
                apiData.setBclbs((int)(apiData.getSjsl()/25));
                api1208.setBclbs((int) (apiData.getSjsl() / 25));
                api1208.setCplgg(25);
                api1208.setCplbs(api1208.getBclbs());
            }

            //设置空属性为默认值
            changeObject(api1208);
            return api1208;
@@ -797,6 +802,7 @@
            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())){
@@ -886,6 +892,10 @@
            }
            //设置空属性为默认值
            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)) {
@@ -1365,6 +1375,7 @@

    /**
     * 赋值最后更新时间
     *
     * @param object
     * @return
     */
@@ -1762,6 +1773,7 @@
        }
        return wjmc;
    }

    private String getYwdh(String wjlx, String wjmc, String ywdh) {
        String[] s = wjmc.split("_");
        if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {