Merge branch 'refs/heads/test' into 2.0

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/java/com/ydtech/modules/ins/model/vo/CustomerInfoVo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.util.ObjectUtils;
 
 import javax.validation.constraints.NotBlank;
 
@@ -63,26 +64,36 @@ public class CustomerInfoVo {
     @ApiModelProperty(value = "同投保人")
     private boolean insuranceHolder;
 
-    public boolean contrastInfo(CustomerInfoVo customerInfoVo){
-        if(!this.name.equals(customerInfoVo.getName()))
+    public boolean contrastInfo(CustomerInfoVo customerInfoVo) {
+        if (!ObjectUtils.nullSafeEquals(this.name, customerInfoVo.getName())) {
             return false;
-        if(!this.identifyNumber.equals(customerInfoVo.getIdentifyNumber()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.identifyNumber, customerInfoVo.getIdentifyNumber())) {
             return false;
-        if(!this.identifyType.equals(customerInfoVo.getIdentifyType()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.identifyType, customerInfoVo.getIdentifyType())) {
             return false;
-        if(!this.addr.equals(customerInfoVo.getAddr()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.addr, customerInfoVo.getAddr())) {
             return false;
-        if(!this.age.equals(customerInfoVo.getAge()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.age, customerInfoVo.getAge())) {
             return false;
-        if(!this.gender.equals(customerInfoVo.getGender()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.gender, customerInfoVo.getGender())) {
             return false;
-        if(!this.mobile.equals(customerInfoVo.getMobile()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.mobile, customerInfoVo.getMobile())) {
             return false;
-        if(!this.identifyValidDate.equals(customerInfoVo.getIdentifyValidDate()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.identifyValidDate, customerInfoVo.getIdentifyValidDate())) {
             return false;
-        if(!this.identifyValidEndDate.equals(customerInfoVo.getIdentifyValidEndDate()))
+        }
+        if (!ObjectUtils.nullSafeEquals(this.identifyValidEndDate, customerInfoVo.getIdentifyValidEndDate())) {
             return false;
+        }
         return true;
     }
 
+
 }

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>