新购接口优化
This commit is contained in:
parent
2d80a26c48
commit
75f8e59e86
|
|
@ -65,7 +65,7 @@ public class PurchaseCheckInfo extends BaseEntity {
|
||||||
/** 物资厂家名称 */
|
/** 物资厂家名称 */
|
||||||
@Excel(name = "物资厂家名称")
|
@Excel(name = "物资厂家名称")
|
||||||
@ApiModelProperty(value = "物资厂家名称")
|
@ApiModelProperty(value = "物资厂家名称")
|
||||||
private Long supplierName;
|
private String supplier;
|
||||||
|
|
||||||
/** 数据所属组织 */
|
/** 数据所属组织 */
|
||||||
@Excel(name = "数据所属组织")
|
@Excel(name = "数据所属组织")
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="arrivalTime" column="arrival_time" />
|
<result property="arrivalTime" column="arrival_time" />
|
||||||
<result property="purchaser" column="purchaser" />
|
<result property="purchaser" column="purchaser" />
|
||||||
<result property="supplierId" column="supplier_id" />
|
<result property="supplierId" column="supplier_id" />
|
||||||
|
<result property="supplier" column="supplier" />
|
||||||
<result property="taxRate" column="tax_rate" />
|
<result property="taxRate" column="tax_rate" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createUserName" column="purchaser_name" />
|
<result property="createUserName" column="purchaser_name" />
|
||||||
|
|
@ -40,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
select
|
select
|
||||||
pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.supplier_id, pci.tax_rate, pci.create_by,
|
pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.supplier_id, pci.tax_rate, pci.create_by,
|
||||||
pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id,
|
pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id,
|
||||||
t.task_status, t.task_type, t.code, su.user_name as create_user_name
|
t.task_status, t.task_type, t.code, su.user_name as create_user_name, msi.supplier
|
||||||
from
|
from
|
||||||
purchase_check_info pci
|
purchase_check_info pci
|
||||||
left join tm_task t on t.task_id = pci.task_id
|
left join tm_task t on t.task_id = pci.task_id
|
||||||
left join sys_user su ON pci.create_by = su.user_id
|
left join sys_user su ON pci.create_by = su.user_id
|
||||||
|
left join ma_supplier_info msi on pci.supplier_id = msi.supplier_id
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.material.purchase.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
|
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.material.purchase.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue