Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:优化项目变更代码，新增已投保列表派单日期范围查询（应许晓要求）"

See merge request fangxinjiang/yifu!96

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceSettleCancel.java

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
@@ -15,8 +17,9 @@ import java.util.Date;
 @Tag(name = "结算信息作废记录")
 public class TInsuranceSettleCancel implements Serializable {
     /**
-     * 
+     * id
      */
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/BigDecimalUtils.java

@@ -237,6 +237,23 @@ public class BigDecimalUtils {
             }
             return bigDecimal;
         }
+
+	/**
+	 * null 默认 为 0
+	 * @Author zhaji
+	 * @Date 2022-08-02
+	 * @param bigDecimal
+	 * @return
+	 **/
+	public static Boolean isNullOrZero(BigDecimal bigDecimal){
+		if (null == bigDecimal){
+			return true;
+		}
+		if (bigDecimal.compareTo(BigDecimal.ZERO) == 0){
+			return true;
+		}
+		return false;
+	}
         /**
          * 对象转为BigDecimal 数据 并四舍五入保留两位小数
          * @Author fxj

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredParam.java

@@ -100,9 +100,15 @@ public class InsuredParam implements Serializable {
 	private Integer isOverdue;
 
 	/**
-	 * 派单日期
+	 * 派单开始日期
 	 */
-	@Schema(description = "派单日期")
-	private String createTime;
+	@Schema(description = "派单开始日期")
+	private String createStartTime;
+
+	/**
+	 * 派单结束日期
+	 */
+	@Schema(description = "派单结束日期")
+	private String createEndTime;
 
 }

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml

@@ -334,8 +334,11 @@
 		<if test="param.isOverdue != null">
 			and detail.IS_OVERDUE = #{param.isOverdue}
 		</if>
-		<if test="param.createTime != null and param.createTime.trim() != ''">
-			AND detail.CREATE_TIME = concat(#{param.createTime}, ' 00:00:00')
+		<if test="param.createStartTime != null and param.createStartTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.createStartTime}, ' 00:00:00')
+		</if>
+		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
 		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
@@ -412,8 +415,11 @@
 		<if test="param.isOverdue != null ">
 			and detail.IS_OVERDUE = #{param.isOverdue}
 		</if>
-		<if test="param.createTime != null and param.createTime.trim() != ''">
-			AND detail.CREATE_TIME = concat(#{param.createTime}, ' 00:00:00')
+		<if test="param.createStartTime != null and param.createStartTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ >= ]]>  concat(#{param.createStartTime}, ' 00:00:00')
+		</if>
+		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
+			AND detail.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
 		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>