危化品查询

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

@@ -73,6 +73,6 @@ public class GoodsEntryController extends BaseController {
         }
         List<Entry> list = this.service.exportList(query);
         ExcelUtil<Entry> util = new ExcelUtil<Entry>(Entry.class);
-        util.exportExcel(response, list, "危险品报关单头数据");
+        util.exportExcel(response, list, "危险品报关单数据");
     }
 }

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

@@ -39,10 +39,10 @@ private static final long serialVersionUID = 1L;
     private BigDecimal qty1;
 
     // 货运值人民币
-    private BigDecimal rmbPriceList;
+    private BigDecimal rmbPrice;
 
     // 货运值美元
-    private BigDecimal usdPriceList;
+    private BigDecimal usdPrice;
 
     // 最大节点时间：对应ENTRY_WORKFLOW表，用于数据每日更新，流程表中CREATE_DATE为当天日期时，
     // acceptDate为前几天不能用该字段进行每日更新范围操作时间

wxjy-wxjy-service/src/main/resources/mapper/analyze/GoodsEntryMapper.xml

@@ -153,8 +153,8 @@
         <result column="G_NAME" jdbcType="VARCHAR" property="gName"/>
         <result column="G_MODEL" jdbcType="VARCHAR" property="gModel"/>
         <result column="QTY_1" jdbcType="NUMERIC" property="qty1"/>
-        <result column="RMB_PRICE" jdbcType="NUMERIC" property="rmbPriceList"/>
-        <result column="USD_PRICE" jdbcType="NUMERIC" property="usdPriceList"/>
+        <result column="RMB_PRICE" jdbcType="NUMERIC" property="rmbPrice"/>
+        <result column="USD_PRICE" jdbcType="NUMERIC" property="usdPrice"/>
         <result column="CODE_TS_SHORT" jdbcType="VARCHAR" property="codeTsShort"/>
         <result column="G_CERT_FLAG" jdbcType="VARCHAR" property="gCertFlag"/>
         <result column="UNGID" jdbcType="VARCHAR" property="ungid"/>
@@ -168,7 +168,16 @@
     </resultMap>
 
     <select id="selectByEntryId" parameterType="String" resultMap="EntryHeadResult">
-        select * from WXJY_ENTRY_HEAD where ENTRY_ID = #{entryId}
+        select b.entry_id,b.main_status,b.pass_mode,b.traf_mode,b.i_e_flag,b.i_e_port,b.decl_port,b.customs_code,b.i_e_date,b.decl_date,
+               b.decl_advance_flag,b.accept_date,b.ex_in_port_date,b.consign_scc,b.consign_code,b.consign_name,
+               b.frn_consign_code,b.frn_consign_name,b.trade_mode,b.trade_country,b.gross_wt,b.net_wt,b.rmb_price,b.usd_price,b.container,
+               b.decl_mode,b.decl_status,b.order_receive_date,nvl(round(b.order_receive_cost/3600,2),0) order_receive_cost,b.cert_rls_date,
+               b.pre_release_date,b.agent_code,b.agent_name,
+               b.note_s,b.owner_code,b.owner_name,b.exam_date,b.check_date,b.comp_ele_date,b.release_date,nvl(round(b.cu_cost/3600,2),0) cu_cost,
+               nvl(round(b.total_cost/3600,2),0) total_cost,nvl(round(b.before_decl_cost/3600,2),0) before_decl_cost,
+               b.prof_verify_flag,b.new_two_step_flag,b.ele_decl_date,b.assess_start_date,b.assess_end_date,b.refund_date,b.refund_flag,
+               b.man_create_time,b.man_chk_time_start,b.man_chk_time_end,b.check_flag,b.man_proc_result,b.man_proc_idea,b.check_customs_code
+        from WXJY_ENTRY_HEAD b where ENTRY_ID = #{entryId}
     </select>
 
     <select id="selectPageList"  parameterType="EntryQuery" resultMap="EntryResultMap">
@@ -225,7 +234,7 @@
         </if>
     </select>
 
-    <select id="getPageEntryList" resultMap="EntryListResultMap">
+    <select id="getEntryList" resultMap="EntryListResultMap">
         SELECT l.* FROM WXJY_ENTRY_LIST l WHERE 1=1
         <if test="entryId != null and entryId != ''">
             AND l.ENTRY_ID = #{entryId}