入库价格核定-v1.1

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

@@ -37,7 +37,7 @@ import java.util.List;
 public interface PriceApprovalMapper extends BaseMapper<PriceApproval> {
     Page<PriceApproval> pageList(Page<Object> objectPage, @Param("ew") QueryWrapper<PriceApproval> queryWrapper);
 
-    List<BusinessContractParam> getContractInfo(@Param("orgId") Integer orgId);
+    List<BusinessContractParam> getContractInfo(@Param("id") Integer id);
 
     List<PriceApprovalInspection> getQualityInfoBySaveJoin(@Param("id") Integer id);
 

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.unis.financialSupervision.modular.priceApproval.mapper.PriceApprovalMapper">
     <select id="pageList" parameterType="com.baomidou.mybatisplus.core.conditions.Wrapper" resultType="com.unis.financialSupervision.modular.priceApproval.entity.PriceApproval">
         SELECT
-            pa.id,
+            pa.*,
             pa.org_id orgId,
             ui.dwmc,
             oi.org_name orgName,
@@ -25,19 +25,17 @@
     </select>
     <select id="getContractInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.priceApproval.param.BusinessContractParam">
         SELECT
-            id,
-            contract_number contractNumber,
-            contract_title contractTitle,
-            signing_time signingTime
+            swd.id,
+            swd.grain_kind grainKind,
+            be.enumname grainKindName,
+            swd.in_count inCount,
+            swd.in_price inPrice,
+            swd.in_detail_total_price inDetailTotalPrice
         FROM
-          business_contract
+            business_store_ware_detail swd
+        LEFT JOIN basic_enum be ON be.enumId = swd.grain_kind
         WHERE
-          audit_state = 2
-        AND in_application != 3
-        AND in_application != 4
-        <if test="orgId != null and orgId != ''">
-            AND org_id = #{orgId}
-        </if>
+            swd.zid = #{id}
     </select>
     <select id="getQualityInfoBySaveJoin" parameterType="integer" resultType="com.unis.financialSupervision.modular.priceApprovalInspection.entity.PriceApprovalInspection">
         SELECT

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/priceApproval/param/BusinessContractParam.java

@@ -16,12 +16,18 @@ public class BusinessContractParam {
     @ApiModelProperty(value = "主键ID")
     private Integer id;
 
-    @ApiModelProperty(value = "合同编号")
-    private String contractNumber;
+    @ApiModelProperty(value = "品种id")
+    private Integer grainKind;
 
-    @ApiModelProperty(value = "合同名称")
-    private String contractTitle;
+    @ApiModelProperty(value = "品种名称")
+    private String grainKindName;
 
-    @ApiModelProperty(value = "竞拍日期")
-    private Date signingTime;
+    @ApiModelProperty(value = "数量（吨）")
+    private String inCount;
+
+    @ApiModelProperty(value = "单价（元/吨）")
+    private String inPrice;
+
+    @ApiModelProperty(value = "金额")
+    private String inDetailTotalPrice;
 }

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

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