Merge remote-tracking branch 'origin/develop_dl_4.0' into develop_dl_4.0

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanReportController.java

@@ -41,6 +41,7 @@ public class PlanReportController extends BaseController {
         planReport.setBizOrgCode(bizOrgCode);
         planReport.setBizOrgName(bizOrgName);
         planReport.setCreateDate(new Date());
+        planReport.setDrillDate(new Date());
         planReportMapper.saveInfo(planReport);
         return CommonResponseUtil.success(planReport);
     }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanReportMapper.xml

@@ -49,10 +49,10 @@
             AND a.biz_org_code like concat(#{bizOrgCode}, '%')
         </if>
         <if test="startDate != null and startDate != ''">
-            AND a.create_date >= #{startDate}
+            AND a.drill_date >= #{startDate}
         </if>
         <if test="endDate != null and endDate != ''">
-            AND #{endDate} >= a.create_date
+            AND #{endDate} >= a.drill_date
         </if>
     </where>
 </select>
@@ -75,10 +75,10 @@
             AND a.biz_org_code like concat(#{bizOrgCode}, '%')
         </if>
         <if test="startDate != null and startDate != ''">
-            AND a.create_date >= #{startDate}
+            AND a.drill_date >= #{startDate}
         </if>
         <if test="endDate != null and endDate != ''">
-            AND #{endDate} >= a.create_date
+            AND #{endDate} >= a.drill_date
         </if>
     </where>
     order by a.create_date desc