Browse Source

入库价格核定-v1.1

hanqingsong 4 months ago
parent
commit
14661d831d

+ 1 - 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;
37
 public interface PriceApprovalMapper extends BaseMapper<PriceApproval> {
37
 public interface PriceApprovalMapper extends BaseMapper<PriceApproval> {
38
     Page<PriceApproval> pageList(Page<Object> objectPage, @Param("ew") QueryWrapper<PriceApproval> queryWrapper);
38
     Page<PriceApproval> pageList(Page<Object> objectPage, @Param("ew") QueryWrapper<PriceApproval> queryWrapper);
39
 
39
 
40
-    List<BusinessContractParam> getContractInfo(@Param("orgId") Integer orgId);
40
+    List<BusinessContractParam> getContractInfo(@Param("id") Integer id);
41
 
41
 
42
     List<PriceApprovalInspection> getQualityInfoBySaveJoin(@Param("id") Integer id);
42
     List<PriceApprovalInspection> getQualityInfoBySaveJoin(@Param("id") Integer id);
43
 
43
 

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

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

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

@@ -16,12 +16,18 @@ public class BusinessContractParam {
16
     @ApiModelProperty(value = "主键ID")
16
     @ApiModelProperty(value = "主键ID")
17
     private Integer id;
17
     private Integer id;
18
 
18
 
19
-    @ApiModelProperty(value = "合同编号")
20
-    private String contractNumber;
19
+    @ApiModelProperty(value = "品种id")
20
+    private Integer grainKind;
21
 
21
 
22
-    @ApiModelProperty(value = "合同名称")
23
-    private String contractTitle;
22
+    @ApiModelProperty(value = "品种名称")
23
+    private String grainKindName;
24
 
24
 
25
-    @ApiModelProperty(value = "竞拍日期")
26
-    private Date signingTime;
25
+    @ApiModelProperty(value = "数量(吨)")
26
+    private String inCount;
27
+
28
+    @ApiModelProperty(value = "单价(元/吨)")
29
+    private String inPrice;
30
+
31
+    @ApiModelProperty(value = "金额")
32
+    private String inDetailTotalPrice;
27
 }
33
 }

+ 1 - 2
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
124
     public PriceApproval detail(PriceApprovalIdParam priceApprovalIdParam) {
124
     public PriceApproval detail(PriceApprovalIdParam priceApprovalIdParam) {
125
         Integer id = priceApprovalIdParam.getId();
125
         Integer id = priceApprovalIdParam.getId();
126
         // 查询主表关联数据
126
         // 查询主表关联数据
127
-//        PriceApproval priceApproval = this.queryEntity(id);
128
         PriceApproval priceApproval = priceApprovalMapper.queryEntityById(id);
127
         PriceApproval priceApproval = priceApprovalMapper.queryEntityById(id);
129
         // 合同信息
128
         // 合同信息
130
-        List<BusinessContractParam> contractInfo = priceApprovalMapper.getContractInfo(priceApproval.getOrgId());
129
+        List<BusinessContractParam> contractInfo = priceApprovalMapper.getContractInfo(priceApproval.getContractId());
131
         if (CollectionUtils.isNotEmpty(contractInfo)) {
130
         if (CollectionUtils.isNotEmpty(contractInfo)) {
132
             priceApproval.setContractList(contractInfo);
131
             priceApproval.setContractList(contractInfo);
133
         }
132
         }