Merge branch 'test'

src/main/java/com/ydtech/modules/ins/model/InsOrdersExcel.java

@@ -16,6 +16,9 @@ public class InsOrdersExcel {
     @ExcelProperty(value = "保险公司名称")
     private String insCompany;
 
+    @ExcelProperty(value = "协议号")
+    private String agreementId;
+
     @ExcelProperty(value = "工号")
     private String userId;
 

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -410,13 +410,24 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
             LocalDateTime start = DateTimeUtil.parseLocalDateTime(coverageEndDate, DateTimeUtil.DATETIME_PATTERN_EXT1);
             LocalDateTime end = start.plusYears(1L).minusDays(1L);
-            String newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
-            if (start.getHour() > 0) {
-                end = start.plusYears(1L);
-                newStartDate = DateTimeUtil.format(start, DateTimeUtil.DATETIME_PATTERN);
+
+//            if (start.getHour() > 0) {
+//                end = start.plusYears(1L);
+//                newStartDate = DateTimeUtil.format(start, DateTimeUtil.DATETIME_PATTERN);
+//            }
+            String newStartDate = "";
+            String newEndDate = "";
+            //判断是否是及时起保
+            if(start.getHour() > 0 || start.getMinute() > 0 || start.getSecond() > 0){
+                newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
+                end = end.plusDays(1L);
+                newEndDate = DateTimeUtil.getStartTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
+            }else{
+                newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
+                newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
             }
 
-            String newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
+//            String newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
             log.error("新起：{}", newStartDate);
             log.error("新止：{}", newEndDate);
 

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -133,6 +133,7 @@
         <result property="jqLossRation" column="jq_loss_ration" jdbcType="VARCHAR"/>
         <result property="syLossRation" column="sy_loss_ration" jdbcType="VARCHAR"/>
         <result property="insCompany" column="inscompany" jdbcType="VARCHAR"/>
+        <result property="agreementId" column="agreement_id" jdbcType="VARCHAR"/>
         <result property="userId" column="userid" jdbcType="VARCHAR"/>
         <result property="userName" column="username" jdbcType="VARCHAR"/>
         <result property="applyInfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"
@@ -370,6 +371,7 @@
         b.sy_loss_ration,
         b.score,
         b.inscompany,
+        b.agreement_id,
         a.userid,
         a.username,
         a.applyinfo,