Merge remote-tracking branch 'origin/master'

czt

2025-01-03 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d

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

@@ -19,6 +19,7 @@
import com.fzzy.push.gd2022.dto.Gd2022Api1023Way;
import com.fzzy.push.gd2022.ApiCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -74,7 +75,7 @@
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(ApiCodeConstant.API_1023);
        apiLog.setInteId(ApiCodeConstant.API_9201);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
@@ -116,7 +117,7 @@
                GD2022Api1023.setYjlx(data.getDrugType());
                GD2022Api1023.setLqrq(data.getLqsj());
                GD2022Api1023.setZhgxsj(data.getUpdateTime());
                if(data.getLqr().contains("、")){
                if (data.getLqr().contains("、")) {
                    GD2022Api1023.setLqr(data.getLqr().replace('、', '|'));
                }

@@ -184,6 +185,9 @@
                        gd2022Api1023People = new Gd2022Api1023People();
                        BeanUtils.copyProperties(people, gd2022Api1023People);
                        gd2022Api1023People.setXm(people.getMx());
                        if (StringUtils.isEmpty(people.getZyzg())) {
                            gd2022Api1023People.setZyzg("中级");
                        }
                        peopleList.add(gd2022Api1023People);
                    }
                    GD2022Api1023.setPeoples(peopleList);
@@ -193,11 +197,11 @@

                infoData.setKqdm(kqdm);
                infoData.setInteType(Constant.API_CATEGORY_13);
                infoData.setInteId(ApiCodeConstant.API_1023);
                infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
                infoData.setInteId(ApiCodeConstant.API_9201);
                infoData.setBizType(PushProtocol.SB_GD_2023.getCode());
                infoData.setUpdateTime(new Date());
                infoData.setDataId(data.getXzbm());
                apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm);
                apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_9201, data.getXzbm(), kqdm);

                if (null == apiInfoList || apiInfoList.isEmpty()) {
                    GD2022Api1023.setCzbz(Constant.CZBZ_I);