|
|
@@ -98,6 +98,28 @@
|
|
|
<result property="invoiceNumber" column="invoice_number"/>
|
|
|
<result property="invoiceFile" column="invoice_file" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
|
|
|
</resultMap>
|
|
|
+
|
|
|
+ <resultMap id="packageSettleMap" type="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
|
|
|
+ <id property="id" column="id"/>
|
|
|
+ <result property="scorePackageName" column="score_package_name"/>
|
|
|
+ <result property="packageEntName" column="name"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="score" column="score"/>
|
|
|
+ <result property="packageFinishStatus" column="package_finish_status"/>
|
|
|
+ <result property="settleStatus" column="settle_status"/>
|
|
|
+ <result property="invoiceCategory" column="invoice_category"/>
|
|
|
+ <result property="sendPackageDeptId" column="send_package_dept_id"/>
|
|
|
+ <result property="settleAmount" column="settle_amount"/>
|
|
|
+ <result property="belongDate" column="belong_date"/>
|
|
|
+ <result property="packageType1" column="package_type1"/>
|
|
|
+ <result property="description" column="description"/>
|
|
|
+ <result property="packageType2" column="package_type2"/>
|
|
|
+ <result property="enableType" column="enable_type"/>
|
|
|
+ <result property="subType" column="sub_type"/>
|
|
|
+ <result property="omsOrderSn" column="oms_order_sn"/>
|
|
|
+ <result property="invoiceNumber" column="invoice_number"/>
|
|
|
+ <result property="invoiceFile" column="invoice_file" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
|
|
|
+ </resultMap>
|
|
|
|
|
|
<select id="listWmScorePackageAndTask" resultMap="wmScorePackageMap">
|
|
|
select id, task_rule_id, drug_ent_id, score_id, score_name, score, agent_type_id, level1_id, level2_id, zb_id,
|
|
|
@@ -1415,7 +1437,7 @@
|
|
|
</select>-->
|
|
|
|
|
|
<!-- 积分包结算（分页） -->
|
|
|
- <select id="listPackageSettleList" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
|
|
|
+ <select id="listPackageSettleList" resultMap="packageSettleMap">
|
|
|
SELECT distinct
|
|
|
p.id,
|
|
|
d.name packageEntName,
|
