CZT
2024-01-18 2fb7ee4542f57ebbd9fff56758f02ea3dc24b677
调整熏蒸备案
已修改5个文件
46 ■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -35,6 +35,10 @@
@Component
public class Fzzy40Sync1023 {
    @Autowired
    private Api1101Rep api1101Rep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Fzzy40Sync1023Rep fzzy40Sync1023Rep;
    @Autowired
    private Fzzy40SyncDrugLogPeopleRep drugLogPeopleRep;
@@ -91,7 +95,16 @@
                BeanUtils.copyProperties(data, gdApi1023);
                gdApi1023.setXzbm(data.getXzbm().substring(8));
                gdApi1023.setKqdm(kqdm);
                List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
                if(null != api1102List && api1102List.size() > 0){
                    gdApi1023.setKqmc(api1102List.get(0).getKqmc());
                }
                gdApi1023.setDwdm(kqdm.substring(0, 18));
                List<Api1101> api1101List = api1101Rep.findPushData(kqdm);
                if(null != api1101List && api1101List.size() > 0){
                    gdApi1023.setDwmc(api1101List.get(0).getDwmc());
                }
                gdApi1023.setYjmc(data.getDrugName());
                gdApi1023.setYjlx(data.getDrugType());
                gdApi1023.setLqrq(data.getLqsj());
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -13,6 +13,10 @@
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="kqmc">
        <Property></Property>
        <Property name="label">库区名称</Property>
      </PropertyDef>
      <PropertyDef name="tbrq">
        <Property name="dataType">Date</Property>
        <Property name="label">填报日期</Property>
@@ -20,6 +24,10 @@
      <PropertyDef name="dwdm">
        <Property></Property>
        <Property name="label">单位代码</Property>
      </PropertyDef>
      <PropertyDef name="dwmc">
        <Property></Property>
        <Property name="label">单位名称</Property>
      </PropertyDef>
      <PropertyDef name="sqxzrq">
        <Property></Property>
@@ -564,6 +572,11 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">kqmc</Property>
                <Property name="property">kqmc</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">tbrq</Property>
                <Property name="property">tbrq</Property>
                <Editor/>
@@ -574,6 +587,11 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dwmc</Property>
                <Property name="property">dwmc</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sqxzrq</Property>
                <Property name="property">sqxzrq</Property>
                <Editor/>
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
@@ -24,12 +24,12 @@
    private String xzbm;    //熏蒸编码
    private String kqdm;    //库区代码
    private String kqmc;    //库区名称
    @JSONField(format = "yyyy-MM-dd")
    private Date tbrq;      //填报日期
    private String dwdm;    //单位代码
    private String dwmc;    //单位名称
    @JSONField(format = "yyyy-MM-dd")
    private Date sqxzrq;  //申请熏蒸日期
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -182,13 +182,12 @@
            return "系统没有当前推送协议配置,执行失败";
        }
        //推送,数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功,更新数据上传状态
            ApiInfoData infoData;
            for (GdApi1023 data : items) {
            //推送,数据为集合形式
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                //推送成功,更新数据上传状态
                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
                data.setCzbz(Constant.CZBZ_U);
                infoData = apiInfoList.get(0);
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -890,6 +890,8 @@
                return ApiCodeConstant.API_CODE_CWBBXX;
            case "1503":
                return ApiCodeConstant.API_CODE_CWBBXX;
            case "1023":
                return ApiCodeConstant.API_CODE_XZBA;
            default:
                return inteId;
        }