Showing
1 changed file
with
9 additions
and
9 deletions
| ... | @@ -177,17 +177,18 @@ public class HsCodeService { | ... | @@ -177,17 +177,18 @@ public class HsCodeService { |
| 177 | * 2023年2月24日17:29:49 | 177 | * 2023年2月24日17:29:49 |
| 178 | */ | 178 | */ |
| 179 | public void setHscodeSupervise(List<HsCode> hsCodeList){ | 179 | public void setHscodeSupervise(List<HsCode> hsCodeList){ |
| 180 | + Map hsCodeAndDescription1 = new HashMap(); | ||
| 181 | + List<HsCodeAndDescription> hsCodeAndDescriptionList = hsCodeAndDescriptionRepository.selectAndType(1); | ||
| 182 | + if (hsCodeAndDescriptionList.size() > 0) { | ||
| 183 | + for (HsCodeAndDescription hsCodeAndDescription : hsCodeAndDescriptionList) { | ||
| 184 | + HsCodeAndDescriptionDto hsCodeAndDescriptionDto = new HsCodeAndDescriptionDto(hsCodeAndDescription); | ||
| 185 | + hsCodeAndDescription1.put(hsCodeAndDescriptionDto.getB(), hsCodeAndDescriptionDto); | ||
| 186 | + } | ||
| 187 | + } | ||
| 188 | + List<String> dictionaryEntriesList = dicEntriesRepository.findDicEntByCodeList(Constant.supervise_condition,1); | ||
| 180 | for (HsCode hsCode : hsCodeList) { | 189 | for (HsCode hsCode : hsCodeList) { |
| 181 | Map<String,Object> hscodeMap = new HashMap<>(); | 190 | Map<String,Object> hscodeMap = new HashMap<>(); |
| 182 | hscodeMap.put("success",false); | 191 | hscodeMap.put("success",false); |
| 183 | - Map hsCodeAndDescription1 = new HashMap(); | ||
| 184 | - List<HsCodeAndDescription> hsCodeAndDescriptionList = hsCodeAndDescriptionRepository.selectAndType(1); | ||
| 185 | - if (hsCodeAndDescriptionList.size() > 0) { | ||
| 186 | - for (HsCodeAndDescription hsCodeAndDescription : hsCodeAndDescriptionList) { | ||
| 187 | - HsCodeAndDescriptionDto hsCodeAndDescriptionDto = new HsCodeAndDescriptionDto(hsCodeAndDescription); | ||
| 188 | - hsCodeAndDescription1.put(hsCodeAndDescriptionDto.getB(), hsCodeAndDescriptionDto); | ||
| 189 | - } | ||
| 190 | - } | ||
| 191 | Boolean isTrue = false; | 192 | Boolean isTrue = false; |
| 192 | if (hsCode !=null){ | 193 | if (hsCode !=null){ |
| 193 | if(hsCodeAndDescription1.size()>0){ | 194 | if(hsCodeAndDescription1.size()>0){ |
| ... | @@ -199,7 +200,6 @@ public class HsCodeService { | ... | @@ -199,7 +200,6 @@ public class HsCodeService { |
| 199 | } | 200 | } |
| 200 | } | 201 | } |
| 201 | } | 202 | } |
| 202 | - List<String> dictionaryEntriesList = dicEntriesRepository.findDicEntByCodeList(Constant.supervise_condition,1); | ||
| 203 | if (dictionaryEntriesList != null && dictionaryEntriesList.size() >0){ | 203 | if (dictionaryEntriesList != null && dictionaryEntriesList.size() >0){ |
| 204 | for (String str : dictionaryEntriesList){ | 204 | for (String str : dictionaryEntriesList){ |
| 205 | if (!StringUtil.isEmptyWithTrim(hsCode.getMonitorCondition()) || hsCode.getOutRate() != null){ | 205 | if (!StringUtil.isEmptyWithTrim(hsCode.getMonitorCondition()) || hsCode.getOutRate() != null){ | ... | ... |
-
Please register or login to post a comment