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

@@ -135,6 +135,13 @@ public class EmergencyRiskEventController {
 		Result<IPage<EmergencyRiskEvent>> result = new Result<IPage<EmergencyRiskEvent>>();
 		QueryWrapper<EmergencyRiskEvent> queryWrapper = QueryGenerator.initQueryWrapper(emergencyRiskEvent, req.getParameterMap());
 		Page<EmergencyRiskEvent> page = new Page<EmergencyRiskEvent>(pageNo, pageSize);
+
+		if(StringUtils.isNotEmpty(emergencyRiskEvent.getStartTime())){
+			queryWrapper.ge("report_date",emergencyRiskEvent.getStartTime());
+		}
+		if(StringUtils.isNotEmpty(emergencyRiskEvent.getEndTime())){
+			queryWrapper.le("report_date",emergencyRiskEvent.getEndTime());
+		}
 		IPage<EmergencyRiskEvent> pageList = emergencyRiskEventService.page(page, queryWrapper);
 
 		//获取流程状态
@@ -189,7 +196,7 @@ public class EmergencyRiskEventController {
 	 * <pre>
 	 * 	 编辑
 	 * </pre>
-	 * @param emergencyRiskEvent
+	 * @param
 	 * @return
 	 * @author 开发者姓名, 开发时间
 	 * @Description: TODO(这里描述这个方法的需求变更情况)

@@ -39,9 +39,11 @@ public class EmergencyPlanData {
 	@Excel(name = "编制单位", width = 15)
     @ApiModelProperty(value = "编制单位")
 	private String prepareTheCompany;
+
 	/**类型:(0-应急预案,1-历史成果,2-资料库)*/
 	@Excel(name = "类型:(0-应急预案,1-历史成果,2-资料库)", width = 15)
     @ApiModelProperty(value = "类型:(0-应急预案,1-历史成果,2-资料库)")
+	@Dict(dicCode = "plan_type")
 	private String docType;
 	/**隐患类型（数据字典类型rectification_info_classify）*/
 	@Dict(dicCode = "rectification_info_classify")

@@ -133,7 +133,7 @@ mybatis-plus:
   configuration:
     call-setters-on-nulls: true
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #数矿专用配置
 skua:
   web-url: http://103.85.171.27:8096