Ver código fonte

1.结算添加是否外部订单字段查询条件

wuhp 2 anos atrás
pai
commit
6df02afe49

+ 3 - 0
src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -750,6 +750,9 @@ handlingProportion,
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getSettlementDate())){
             params.put("settlementDate", insPlyIncomeVo.getSettlementDate());
         }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getIsExternal())){
+            params.put("isExternal", insPlyIncomeVo.getIsExternal());
+        }
 
         return params;
     }

+ 4 - 0
src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -394,4 +394,8 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty(value = "平台导入结算IdList")
     private List<String> settIdList;
 
+
+    @ApiModelProperty("是否外部订单")
+    private String isExternal;
+
 }

+ 29 - 0
src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -351,6 +351,10 @@
             <if test="yearStrat  !=null  and  yearStrat  != ''  and  yearEnd   != null  and  yearEnd   !=''">
                 AND DATE(a.signdate) BETWEEN #{yearStrat} AND #{yearEnd}
             </if>
+
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
         </where>
         ORDER  BY  a.create_time  desc
 
@@ -399,6 +403,10 @@
             <if test="year !=null  and  year  !=''">
                 and YEAR(a.signdate) =#{year}
             </if>
+
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
             group by  MONTH(a.signdate)
         </where>
     </select>
@@ -1013,6 +1021,10 @@
                     and a.handling_fees_status =#{handlingFeesStatus}
                 </if>
 
+                <if test="isExternal  !=null  and  isExternal  != ''">
+                    AND pa.is_external =#{isExternal}
+                </if>
+
                 <if test="documentaryFeesStatus !=null  and  documentaryFeesStatus  !=''">
                     and a.documentary_fees_status =#{documentaryFeesStatus}
                 </if>
@@ -1242,6 +1254,7 @@
             <if test="month !=null  and  month !=''">
                 AND month(a.signdate) =#{month}
             </if>
+
             <if test="day !=null  and  day !=''">
                 AND day(a.signdate) =#{day}
             </if>
@@ -1308,6 +1321,10 @@
                 and a.company_id =#{companyName}
             </if>
 
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
+
             <if test="policyno !=null  and  policyno  !=''">
                 and a.policyno =#{policyno}
             </if>
@@ -1437,6 +1454,9 @@
             <if test="year !=null  and  year  !=''">
                 AND YEAR(a.signdate) =#{year}
             </if>
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
             <if test="isOther !=null  and  isOther  !=''">
                 and a.is_not_documentary   =#{isOther}
             </if>
@@ -1686,6 +1706,9 @@
                 and a.is_not_car =#{isNotCar}
             </if>
 
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
 
             <if test="handlingFeesStatus !=null  and  handlingFeesStatus  !=''">
                 and a.handling_fees_status =#{handlingFeesStatus}
@@ -1951,6 +1974,9 @@
                 and pa.agreement_type =#{agreementType}
             </if>
 
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
             <if test="signDateEnd !=null  and  signDateEnd!='' and  signDateStart !=null and signDateStart !=''">
                 and a.signdate   between #{signDateStart} and #{signDateEnd}
             </if>
@@ -2204,6 +2230,9 @@
             <if test="companyName !=null  and  companyName  !=''">
                 and a.company_id =#{companyName}
             </if>
+            <if test="isExternal  !=null  and  isExternal  != ''">
+                AND pa.is_external =#{isExternal}
+            </if>
 
             <if test="policyno !=null  and  policyno  !=''">
                 and a.policyno =#{policyno}