危险品类型处理

wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/controller/ChemicalsEntryController.java

@@ -9,6 +9,7 @@ import cn.gov.customs.wxjy.common.core.controller.BaseController;
 import cn.gov.customs.wxjy.common.utils.StringUtils;
 import cn.gov.customs.wxjy.common.utils.poi.DynamicExcelUtil;
 import cn.gov.customs.wxjy.base.service.BaseCodeService;
+import cn.gov.customs.wxjy.system.service.DictDataService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
@@ -30,6 +31,7 @@ public class ChemicalsEntryController extends BaseController {
 
     private final IGoodsEntryService service;
     private final BaseCodeService baseCodeService;
+    private final DictDataService dictDataService;
 
     @GetMapping("/get-entry")
     public Result<EntryInfo> getEntryHead(@RequestParam String entryId) {
@@ -78,7 +80,7 @@ public class ChemicalsEntryController extends BaseController {
             excel.setTradeMode(baseCodeService.getTradeByCode(excel.getTradeMode())==null?"":baseCodeService.getTradeByCode(excel.getTradeMode()).getAbbrTrade());
             excel.setIePort(baseCodeService.getCustomsByCode(excel.getIePort())==null?"":baseCodeService.getCustomsByCode(excel.getIePort()).getCustomsName());
             excel.setTradeCountry(baseCodeService.getCountryByIso(excel.getTradeCountry())==null?"":baseCodeService.getCountryByIso(excel.getTradeCountry()).getCounCName());
-
+            excel.setGoodsType(dictDataService.selectDictLabel("goods_type",excel.getGoodsType()));
         });
         // 使用动态Excel工具类
         DynamicExcelUtil<Entry> util = new DynamicExcelUtil<>(Entry.class);

wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/controller/GoodsEntryController.java

@@ -10,7 +10,9 @@ import cn.gov.customs.cacp.sdks.core.user.pojo.CacpLogonUser;
 import cn.gov.customs.wxjy.analyze.pojo.EntryInfo;
 import cn.gov.customs.wxjy.analyze.pojo.EntryList;
 import cn.gov.customs.wxjy.base.service.BaseCodeService;
+import cn.gov.customs.wxjy.common.utils.DictUtils;
 import cn.gov.customs.wxjy.common.utils.poi.DynamicExcelUtil;
+import cn.gov.customs.wxjy.system.service.DictDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import cn.gov.customs.wxjy.common.core.controller.BaseController;
@@ -34,6 +36,7 @@ public class GoodsEntryController extends BaseController {
 
     private final IGoodsEntryService service;
     private final BaseCodeService baseCodeService;
+    private final DictDataService dictDataService;
 
     @GetMapping("/get-entry")
     public Result<EntryInfo> getEntryHead(@RequestParam String entryId) {
@@ -82,7 +85,7 @@ public class GoodsEntryController extends BaseController {
             excel.setTradeMode(baseCodeService.getTradeByCode(excel.getTradeMode())==null?"":baseCodeService.getTradeByCode(excel.getTradeMode()).getAbbrTrade());
             excel.setIePort(baseCodeService.getCustomsByCode(excel.getIePort())==null?"":baseCodeService.getCustomsByCode(excel.getIePort()).getCustomsName());
             excel.setTradeCountry(baseCodeService.getCountryByIso(excel.getTradeCountry())==null?"":baseCodeService.getCountryByIso(excel.getTradeCountry()).getCounCName());
-
+            excel.setGoodsType(dictDataService.selectDictLabel("goods_type",excel.getGoodsType()));
         });
         // 使用动态Excel工具类
         DynamicExcelUtil<Entry> util = new DynamicExcelUtil<>(Entry.class);

wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/analyze/pojo/Entry.java

@@ -325,6 +325,6 @@ public class Entry implements Serializable {
   /**
    * 危险品类型（1、危化品；2、危险货物；3、危化品兼危险货物）
    */
-  @Excel(name = "危险品类型", dictType = "goods_type",sort=65)
+  @Excel(name = "危险品类型",sort=65)
   private String goodsType;
 }

wxjy-wxjy-service/src/main/resources/mapper/system/DictDataMapper.xml

@@ -48,7 +48,7 @@
     </select>
 
     <select id="selectDictLabel" resultType="String">
-        select dict_label from zhsj_dict_data
+        select dict_label from wxjy_dict_data
         where dict_type = #{dictType} and dict_value = #{dictValue}
     </select>