优化上海接口批次号

CZT

2023-10-30 76a6e71310e4abc19e5733c02cf35c1eb8b3a727

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

@@ -338,7 +338,6 @@
            Api1202 apiData = (Api1202) data;
            BeanUtils.copyProperties(apiData, api1202);
            api1202.setBjw(ShAreaBjw.getBjw(code));
            api1202.setPch(apiData.getHwdm() + apiData.getShnd());
            api1202.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1202.getCddm())) {
                api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -352,6 +351,9 @@
            if (StringUtils.isEmpty(api1202.getRkjsdh())) {
                api1202.setRkjsdh("0");
            }

            //设置批次号
            api1202.setPch(apiData.getHwdm() + apiData.getShnd());
            //设置空属性为默认值
            changeObject(api1202);
            return api1202;
@@ -361,9 +363,6 @@
            Api1203 apiData = (Api1203) data;
            BeanUtils.copyProperties(apiData, api1203);
            api1203.setBjw(ShAreaBjw.getBjw(code));
            //查询收获年份
            List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
            api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
            if (StringUtils.isEmpty(api1203.getJyxm())) {
                api1203.setJyxm("0");
            }
@@ -376,6 +375,10 @@
            if (StringUtils.isEmpty(api1203.getZkl())) {
                api1203.setZkl("0");
            }
            //设置批次号
            List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
            api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());

            //设置空属性为默认值
            changeObject(api1203);
            return api1203;
@@ -385,6 +388,8 @@
            Api1204 apiData = (Api1204) data;
            BeanUtils.copyProperties(apiData, api1204);
            api1204.setBjw(ShAreaBjw.getBjw(code));

            //设置批次号
            api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));

            //设置空属性为默认值
@@ -397,7 +402,7 @@
            Api1205 apiData = (Api1205) data;
            BeanUtils.copyProperties(apiData, api1205);
            api1205.setBjw(ShAreaBjw.getBjw(code));
            api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));

            api1205.setJzrq(apiData.getCmsj());
            if (StringUtils.isEmpty(api1205.getCddm())) {
                api1205.setCddm(api1205.getHwdm().substring(2, 8));
@@ -411,6 +416,9 @@
            if (StringUtils.isEmpty(api1205.getCkjsdh())) {
                api1205.setCkjsdh("0");
            }
            //设置批次号
            api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));

            //设置空属性为默认值
            changeObject(api1205);
            return api1205;
@@ -421,6 +429,7 @@
            BeanUtils.copyProperties(apiData, api1206);
            api1206.setBjw(ShAreaBjw.getBjw(code));
            List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
            //设置批次号
            api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));

            //设置空属性为默认值
@@ -449,6 +458,7 @@
            api1208.setZglkdm(api1208.getHwdm().substring(0, 21));

            api1208.setBjw(ShAreaBjw.getBjw(code));
            //设置批次号
            api1208.setPch(apiData.getHwdm() + apiData.getShnd());
            if (StringUtils.isEmpty(api1208.getCd())) {
                api1208.setCd(api1208.getHwdm().substring(2, 8));
@@ -629,6 +639,7 @@
            BeanUtils.copyProperties(apiData, api1310);
            api1310.setBjw(ShAreaBjw.getBjw(code));
            api1310.setJyrq(apiData.getJysj());

            if (StringUtils.isEmpty(api1310.getJyxm())) {
                api1310.setJyxm("0");
            }
@@ -636,12 +647,16 @@
                api1310.setJyxmz("0");
            }
            String lsxzdm = "122";
            String pch = apiData.getHwdm() + DateFormatUtils.format(new Date(), "yyyy");
            List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
            if(null != api1208List && api1208List.size() > 0){
                if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
                    lsxzdm = api1208List.get(0).getLsxzdm();
                    pch = apiData.getHwdm() + api1208List.get(0).getShnd();
                }
            }
            //设置批次号
            api1310.setPch(pch);
            api1310.setLsxzdm(lsxzdm);
            if (api1310.getYpsl() == 0.0){
                api1310.setYpsl(5.0);
@@ -655,6 +670,7 @@
            if(StringUtils.isEmpty(api1310.getShrxm())){
                api1310.setShrxm("审核人");
            }

            //设置空属性为默认值
            changeObject(api1310);
            return api1310;