Jelajahi Sumber

修改bug:
这个单子是平台的,审核通过之后,平台协议应收和私有协议应收同时都进了这个单子

jiakai 4 bulan lalu
induk
melakukan
8db88c00c1

+ 11 - 2
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -75,8 +75,13 @@ public class ReceivableController {
     @PostMapping("getCommissionReceivableList")
     @Operation(summary = "获取私有协议手续费列表")
     public HttpResult<Page<InsPlyIncome>> getCommissionReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
-        receivableQueryVo.setQueryType("2");
-        receivableQueryVo.setAgreementType("2");
+        if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
+            receivableQueryVo.setQueryType("2");
+        }
+        // 协议类型 1 平台协议  2 私有协议
+        if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
+            receivableQueryVo.setAgreementType("2");
+        }
         return HttpResult.ok(receivableService.getReceivablePage(receivableQueryVo));
     }
 
@@ -223,6 +228,10 @@ public class ReceivableController {
         if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
             receivableQueryVo.setQueryType("1");
         }
+        // 协议类型 1 平台协议  2 私有协议
+        if (StrUtil.isBlank(receivableQueryVo.getAgreementType())){
+            receivableQueryVo.setAgreementType("1");
+        }
         return HttpResult.ok(receivableService.getPlatFormReceivableList(receivableQueryVo));
     }
 

+ 1 - 1
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -279,7 +279,7 @@
             left join sys_user su on su.id = suji.user_id
             where sujis.type_attr =#{receivableQueryVo.typeAttr})
         </if>
-        <if test = "receivableQueryVo.agreementType != null and receivableQueryVo.agreementType == 1">
+        <if test = "receivableQueryVo.agreementType != null and receivableQueryVo.agreementType != ''">
             AND ipi.agreement_type = #{receivableQueryVo.agreementType}
         </if>
         <if test = "receivableQueryVo.ids != null and receivableQueryVo.ids.size > 0">