入库价格核定-v1.0

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/priceApproval/entity/PriceApproval.java

@@ -101,6 +101,14 @@ public class PriceApproval {
     @TableField(exist = false)
     private BigDecimal settleDate;
 
+    @ApiModelProperty(value = "附件-合同带出", position = 17)
+    @TableField(exist = false)
+    private String attachment;
+
+    @ApiModelProperty(value = "附件-竞拍日期", position = 18)
+    @TableField(exist = false)
+    private String signingTime;
+
     @ApiModelProperty(value = "合同信息")
     @TableField(exist = false)
     private List<BusinessContractParam> contractList;

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/priceApproval/mapper/PriceApprovalMapper.java

@@ -46,4 +46,6 @@ public interface PriceApprovalMapper extends BaseMapper<PriceApproval> {
     List<PriceApprovalSettle> getApprovalSettleList(@Param("id") Integer id);
 
     List<DataCPZ> getApprovalThreeRKMX(@Param("orgId") Integer orgId);
+
+    PriceApproval queryEntityById(@Param("id") Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/priceApproval/mapper/mapping/PriceApprovalMapper.xml

@@ -125,4 +125,17 @@
         LEFT JOIN basic_warehouse bw ON bw.warehouse_id = cpz.sjhwID
         WHERE cpz.DeptID = #{orgId}
     </select>
+    <select id="queryEntityById" parameterType="integer" resultType="com.unis.financialSupervision.modular.priceApproval.entity.PriceApproval">
+        SELECT
+            pa.*, oi.org_name orgName,
+            bc.contract_number contractNumber,
+            bc.attachment,
+            bc.signing_time signingTime
+        FROM
+            business_fs_storage_price_approval pa
+        LEFT JOIN org_info oi ON pa.org_id = oi.org_id
+        LEFT JOIN business_contract bc ON pa.contract_id = bc.id
+        WHERE
+            pa.id = #{id}
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/priceApproval/service/impl/PriceApprovalServiceImpl.java

@@ -124,7 +124,8 @@ public class PriceApprovalServiceImpl extends ServiceImpl<PriceApprovalMapper, P
     public PriceApproval detail(PriceApprovalIdParam priceApprovalIdParam) {
         Integer id = priceApprovalIdParam.getId();
         // 查询主表关联数据
-        PriceApproval priceApproval = this.queryEntity(id);
+//        PriceApproval priceApproval = this.queryEntity(id);
+        PriceApproval priceApproval = priceApprovalMapper.queryEntityById(id);
         // 合同信息
         List<BusinessContractParam> contractInfo = priceApprovalMapper.getContractInfo(priceApproval.getOrgId());
         if (CollectionUtils.isNotEmpty(contractInfo)) {