Showing
1 changed file
with
4 additions
and
4 deletions
| ... | @@ -177,9 +177,6 @@ public class HsCodeService { | ... | @@ -177,9 +177,6 @@ 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 | - for (HsCode hsCode : hsCodeList) { | ||
| 181 | - Map<String,Object> hscodeMap = new HashMap<>(); | ||
| 182 | - hscodeMap.put("success",false); | ||
| 183 | Map hsCodeAndDescription1 = new HashMap(); | 180 | Map hsCodeAndDescription1 = new HashMap(); |
| 184 | List<HsCodeAndDescription> hsCodeAndDescriptionList = hsCodeAndDescriptionRepository.selectAndType(1); | 181 | List<HsCodeAndDescription> hsCodeAndDescriptionList = hsCodeAndDescriptionRepository.selectAndType(1); |
| 185 | if (hsCodeAndDescriptionList.size() > 0) { | 182 | if (hsCodeAndDescriptionList.size() > 0) { |
| ... | @@ -188,6 +185,10 @@ public class HsCodeService { | ... | @@ -188,6 +185,10 @@ public class HsCodeService { |
| 188 | hsCodeAndDescription1.put(hsCodeAndDescriptionDto.getB(), hsCodeAndDescriptionDto); | 185 | hsCodeAndDescription1.put(hsCodeAndDescriptionDto.getB(), hsCodeAndDescriptionDto); |
| 189 | } | 186 | } |
| 190 | } | 187 | } |
| 188 | + List<String> dictionaryEntriesList = dicEntriesRepository.findDicEntByCodeList(Constant.supervise_condition,1); | ||
| 189 | + for (HsCode hsCode : hsCodeList) { | ||
| 190 | + Map<String,Object> hscodeMap = new HashMap<>(); | ||
| 191 | + hscodeMap.put("success",false); | ||
| 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