CZT
2023-11-07 9075639de65743f310d63a65700ce9a3b79247fe
调整品种信息
已修改8个文件
60 ■■■■ 文件已修改
src/main/java/com/fzzy/api/view/Api1310.view.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/Api1310.view.xml
@@ -16,9 +16,19 @@
      <PropertyDef name="lspzdm">
        <Property></Property>
        <Property name="label">粮食品种代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSPZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="lsdjdm">
        <Property name="label">粮食等级代码</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSDJ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="rkrq">
        <Property name="dataType">Date</Property>
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -107,7 +107,10 @@
                if(StringUtils.isEmpty(sysData.getFoodVariety())){
                    continue;
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                apiData.setLspzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -139,7 +139,10 @@
                apiData.setDjsj(sysData.getRegisterTime());
                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                apiData.setLspzdm(mappingCode);
                //粮食性质
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -132,7 +132,10 @@
            apiData.setDjsj(sysData.getRegisterTime());
            //粮食品种
            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
            String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
            if(StringUtils.isEmpty(mappingCode)){
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
            }
            apiData.setLspzdm(mappingCode);
            //粮食等级
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -15,6 +15,7 @@
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1207Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -36,6 +37,8 @@
    private ApiCommonService commonService;
    @Autowired
    private Api1207Rep api1207Rep;
    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private ApiLogRep apiLogRep;
@@ -87,7 +90,11 @@
                apiData.setTzdh(sysData.getNoticeId());
                apiData.setDcdw(kqdm);
                apiData.setDrdw(kqdm);
                apiData.setLspzdm(sysData.getFoodVariety());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                apiData.setLspzdm(mappingCode);
                apiData.setDchwdm(api1105Out.getHwdm());
                apiData.setDrhwdm(api1105In.getHwdm());
                apiData.setDcrq(sysData.getChangeDate());
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,7 +87,10 @@
                apiData.setHwdm(api1105.getHwdm());
                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
                }
                apiData.setLspzdm(mappingCode);
                //粮食性质
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -6,6 +6,7 @@
import com.fzzy.api.entity.Api1210;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1209Rep;
import com.fzzy.api.view.repository.Api1210Rep;
@@ -15,6 +16,7 @@
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1210Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -36,6 +38,8 @@
    private Api1210Rep api1210Rep;
    @Autowired
    private ApiCommonService commonService;
    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private ApiLogRep apiLogRep;
@@ -74,9 +78,15 @@
                apiData.setLssl(sysData.getNumber());
                apiData.setHzsl(sysData.getChangeNumber());
                apiData.setBzwh(sysData.getApprovalId());
                apiData.setLspzdm(sysData.getFoodVariety());
                apiData.setHzqlsxzdm(sysData.getFoodType());
                apiData.setHzhlsxzdm(sysData.getNewFoodType());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                apiData.setLspzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setHzqlsxzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setHzhlsxzdm(mappingCode);
                apiData.setHzrq(sysData.getChangeTime());
                apiData.setCcshr(sysData.getCcshr());
                apiData.setZjshr(sysData.getZjshr());
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -93,7 +93,10 @@
                api1310.setHwdm(api1105.getHwdm());
                api1310.setKqdm(kqdm);
                //粮食品种
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40Quality.getFoodVariety().substring(0, 3));
                }
                api1310.setLspzdm(mappingCode);
                //粮食等级