Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -789,7 +789,9 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getCreateTimeStart())){
             params.put("createTimeStart", insPlyIncomeVo.getCreateTimeStart());
         }
-
+        if(StringUtils.isNotBlank(insPlyIncomeVo.getAddType())){
+            params.put("addType", insPlyIncomeVo.getAddType());
+        }
         return params;
     }
 

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -359,6 +359,9 @@
             <if test="isExternal  !=null  and  isExternal  != ''">
                 AND pa.is_external =#{isExternal}
             </if>
+            <if test="addType !=null  and  addType  !=''">
+                AND  a.add_type =#{addType}
+            </if>
         </where>
         ORDER  BY  a.create_time  desc
 
@@ -1190,6 +1193,9 @@
             <if test="day !=null  and  day !=''">
                 AND day(a.signdate) =#{day}
             </if>
+            <if test="addType !=null  and  addType !=''">
+                AND a.add_type =#{addType}
+            </if>
         </where>
         GROUP BY  a.partner_companies_id,pa.insurance_company_id,pa.docking_person
     </select>