合同信息默认值

YYC

2024-05-05 33752de094eca456a72a34ed2f2f3b1eefd9df4c

合同信息默认值

 src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutContract.java

@@ -205,7 +205,7 @@

    @Column(name = "AUDIT_DATE_")
    @PropertyDef(label = "审批时间", description = "格式：yyyy-MM-dd HH:mm:ss")
    private String auditDate;
    private Date auditDate;

    @Column(name = "AUDIT_STATUS_", length = 10)
    @PropertyDef(label = "审批状态")

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java

@@ -15,6 +15,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -101,6 +102,10 @@
                        continue;
                    }
                    apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
                    apiData.setSfzh(listCustomer.get(0).getCardId());
                    apiData.setLxrdh(listCustomer.get(0).getPhone());
                    apiData.setYzbm(StringUtils.isEmpty(listCustomer.get(0).getYzbm()) ? "000000" : sysData.getYzbm());
                    apiData.setDzyx(listCustomer.get(0).getDzyx());
                }


@@ -109,7 +114,7 @@

                apiData.setQdrq(sysData.getSigningTime());

                if(StringUtils.isEmpty(sysData.getFoodVariety())){
                if (StringUtils.isEmpty(sysData.getFoodVariety())) {
                    continue;
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
@@ -139,8 +144,17 @@
                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());

                apiData.setWcrq(sysData.getEndTime());

                apiData.setLxrxm(sysData.getFddbr());
                apiData.setJsyhtbyzyy(StringUtils.isEmpty(sysData.getJsyhtbyzyy()) ? "结算与合同不一致原因" : sysData.getJsyhtbyzyy());
                apiData.setQddd(StringUtils.isEmpty(sysData.getSignAddress()) ? "签订地点" : sysData.getSignAddress());
                apiData.setTxdz(StringUtils.isEmpty(sysData.getTxdz()) ? "通讯地址" : sysData.getTxdz());
                apiData.setZhgxsj(sysData.getCreateTime());
                apiData.setShr(StringUtils.isEmpty(sysData.getAuditUser()) ? "审批人" : sysData.getAuditUser());
                apiData.setShsj(sysData.getAuditDate() == null ? new Date() : sysData.getAuditDate());
                apiData.setSswcsj(sysData.getRelEndTime());
                apiData.setYdwcsj(sysData.getEndTime());
                apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser())?"本方签约人":sysData.getSignUser());


                apiData.setSyncTime(new Date());
                apiData.setBizId(sysData.getId());
@@ -158,10 +172,10 @@
                log.info("1201---合同同步数据：{}", apiData.toString());

                //若附件id不为空，则判断是否为上海协议，上海协议时，需同时同步合同附件信息
                if(StringUtils.isNotEmpty(sysData.getFileId())){
                if (StringUtils.isNotEmpty(sysData.getFileId())) {
                    //若为上海省平台协议，则需同时同步合同附件信息
                    List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
                    if(null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())){
                    if (null != apiConfs && PushProtocol.SB_SH_2023.getCode().equals(apiConfs.get(0).getPushProtocol())) {
                        api1109 = new Api1109();
                        //主键id
                        api1109.setId(apiData.getHth());
@@ -170,8 +184,8 @@

                        String kzm = "pdf"; //扩展名：默认为pdf
                        String[] split = sysData.getFileId().split("\\.");
                        if(split.length > 0){
                            kzm = split[split.length -1];
                        if (split.length > 0) {
                            kzm = split[split.length - 1];
                        }

                        //文件名称(合同号+扩展名)

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java

@@ -114,8 +114,12 @@
                } else {
                    apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
                }
                //粮权行政区划代码
                apiData.setLqxzqhdm(api1102.getXzqhdm());
                //粮权行政区划代码,省级储备粮粮权为省级
                if (apiData.getLsdjdm().equals("121")) {
                    apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
                } else {
                    apiData.setLqxzqhdm(api1102.getXzqhdm());
                }
                //管理方式-默认直储
                if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
                    apiData.setGlfs("01");
@@ -128,8 +132,8 @@
                //储粮方式
                apiData.setClfs(fz40DepotStore.getStoreType());
                //包装储粮是，核查包存粮包数
                if("2".equals(apiData.getClfs())){
                    apiData.setBclbs((int)(fz40DepotStore.getStorageReal()/25));
                if ("2".equals(apiData.getClfs())) {
                    apiData.setBclbs((int) (fz40DepotStore.getStorageReal() / 25));
                }

                //货位状态
@@ -142,7 +146,7 @@
                apiData.setRcsj(fz40DepotStore.getStoreDate());
                //封仓日期
                if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
                    if(null == fz40DepotStore.getFullDate()){
                    if (null == fz40DepotStore.getFullDate()) {
                        fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
                    }
                    apiData.setFcrq(fz40DepotStore.getFullDate());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java

@@ -13,6 +13,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;

@@ -43,7 +44,7 @@
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {

        log.info("-------------1201接口数据开始同步------------------");
        log.info("-------------1212接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
@@ -96,9 +97,9 @@


                api1212List = api1212Rep.getDataById(apiData.getId());
                if(null == api1212List || api1212List.isEmpty()){
                if (null == api1212List || api1212List.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                } else {
                    apiData.setCzbz(api1212List.get(0).getCzbz());
                }