完善招投标导入测试与文档
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.ruoyi.ccdi.project.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
@@ -80,4 +81,6 @@ public class CcdiProjectExtendedPurchaseDetailVO {
|
||||
private String updatedBy;
|
||||
|
||||
private String updateTime;
|
||||
|
||||
private List<CcdiProjectExtendedPurchaseSupplierVO> supplierList;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.ruoyi.ccdi.project.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 专项核查采购供应商明细
|
||||
*/
|
||||
@Data
|
||||
public class CcdiProjectExtendedPurchaseSupplierVO {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String purchaseId;
|
||||
|
||||
private String supplierName;
|
||||
|
||||
private String supplierUscc;
|
||||
|
||||
private String contactPerson;
|
||||
|
||||
private String contactPhone;
|
||||
|
||||
private String supplierBankAccount;
|
||||
|
||||
private Integer isBidWinner;
|
||||
|
||||
private Integer sortOrder;
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import com.ruoyi.ccdi.project.domain.dto.CcdiProjectExtendedRecruitmentQueryDTO;
|
||||
import com.ruoyi.ccdi.project.domain.dto.CcdiProjectExtendedTransferQueryDTO;
|
||||
import com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedPurchaseDetailVO;
|
||||
import com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedPurchaseListItemVO;
|
||||
import com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedPurchaseSupplierVO;
|
||||
import com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedRecruitmentDetailVO;
|
||||
import com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedRecruitmentListItemVO;
|
||||
import com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedTransferDetailVO;
|
||||
@@ -96,6 +97,18 @@ public interface CcdiProjectSpecialCheckMapper {
|
||||
@Param("purchaseId") String purchaseId
|
||||
);
|
||||
|
||||
/**
|
||||
* 查询专项核查采购供应商明细
|
||||
*
|
||||
* @param projectId 项目ID
|
||||
* @param purchaseId 采购事项ID
|
||||
* @return 供应商明细
|
||||
*/
|
||||
List<CcdiProjectExtendedPurchaseSupplierVO> selectExtendedPurchaseSuppliers(
|
||||
@Param("projectId") Long projectId,
|
||||
@Param("purchaseId") String purchaseId
|
||||
);
|
||||
|
||||
/**
|
||||
* 查询专项核查招聘拓展列表
|
||||
*
|
||||
|
||||
@@ -103,6 +103,9 @@ public class CcdiProjectSpecialCheckServiceImpl implements ICcdiProjectSpecialCh
|
||||
if (detail == null) {
|
||||
throw new ServiceException("当前记录不属于该项目专项核查范围");
|
||||
}
|
||||
detail.setSupplierList(defaultList(
|
||||
specialCheckMapper.selectExtendedPurchaseSuppliers(queryDTO.getProjectId(), queryDTO.getPurchaseId())
|
||||
));
|
||||
return detail;
|
||||
}
|
||||
|
||||
|
||||
@@ -574,6 +574,33 @@
|
||||
where p.purchase_id = #{purchaseId}
|
||||
</select>
|
||||
|
||||
<select id="selectExtendedPurchaseSuppliers"
|
||||
resultType="com.ruoyi.ccdi.project.domain.vo.CcdiProjectExtendedPurchaseSupplierVO">
|
||||
select
|
||||
s.id,
|
||||
s.purchase_id,
|
||||
s.supplier_name,
|
||||
s.supplier_uscc,
|
||||
s.contact_person,
|
||||
s.contact_phone,
|
||||
s.supplier_bank_account,
|
||||
s.is_bid_winner,
|
||||
s.sort_order
|
||||
from ccdi_purchase_transaction_supplier s
|
||||
inner join ccdi_purchase_transaction p on p.purchase_id = s.purchase_id
|
||||
inner join (
|
||||
select distinct scope.staff_name
|
||||
from (
|
||||
<include refid="projectEmployeeScopeSql"/>
|
||||
) scope
|
||||
where scope.staff_name is not null
|
||||
and scope.staff_name != ''
|
||||
) scoped_staff
|
||||
on scoped_staff.staff_name = p.applicant_name
|
||||
where s.purchase_id = #{purchaseId}
|
||||
order by s.sort_order asc, s.id asc
|
||||
</select>
|
||||
|
||||
<select id="selectExtendedRecruitmentPage" resultMap="ExtendedRecruitmentListItemResultMap">
|
||||
<bind name="projectId" value="query.projectId"/>
|
||||
select distinct r.recruit_id,
|
||||
|
||||
Reference in New Issue
Block a user