feat(ajh): 添加经营方案审批功能

- 新增 AjhPlanScheduleInfo 实体类，用于经营方案审批
- 实现经营方案审批的 CRUD 接口和控制器
- 添加经营方案审批的流程启动功能
- 在 FlowBussinessDescManageServiceImpl 中增加经营方案审批流程的处理逻辑
- 更新 DataAssessmentInfo 实体类，添加考核对象和考核时间类型等字段
- 在 DangerInspectionRecordController 中添加巡检类型查询条件
- 更新 DangerInspectionRecordVO 实体类，添加巡检类型字段

+package com.skua.modules.ajh.controller;
+
+import java.util.*;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.ajh.entity.AjhPlanScheduleInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.ajh.service.IAjhPlanScheduleInfoService;
+import com.skua.modules.emergency.entity.DangerousOperation;
+import com.skua.modules.flow.business.service.FlowBusinessService;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 经营方案审批父类
+ * </pre>
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags="经营方案审批父类")
+@RestController
+@RequestMapping("/ajh/ajhPlanScheduleInfo")
+public class AjhPlanScheduleInfoController {
+	@Autowired
+	private IAjhPlanScheduleInfoService ajhPlanScheduleInfoService;
+	@Autowired
+	private FlowBusinessService flowBusinessService;
+
+	/**
+	 * <pre>
+	 * 	分页列表查询
+	 * </pre>
+	 * @param ajhPlanScheduleInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+	@AutoLog(value = "经营方案审批父类-分页列表查询")
+	@ApiOperation(value="经营方案审批父类-分页列表查询", notes="经营方案审批父类-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<AjhPlanScheduleInfo>> queryPageList(AjhPlanScheduleInfo ajhPlanScheduleInfo,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<AjhPlanScheduleInfo>> result = new Result<IPage<AjhPlanScheduleInfo>>();
+		QueryWrapper<AjhPlanScheduleInfo> queryWrapper = QueryGenerator.initQueryWrapper(ajhPlanScheduleInfo, req.getParameterMap());
+		Page<AjhPlanScheduleInfo> page = new Page<AjhPlanScheduleInfo>(pageNo, pageSize);
+		IPage<AjhPlanScheduleInfo> pageList = ajhPlanScheduleInfoService.page(page, queryWrapper);
+
+		//获取流程状态
+		List<AjhPlanScheduleInfo> records = pageList.getRecords();
+		Set<String> processInstanceIdSet = records.stream().filter(data-> StringUtils.isNotBlank(data.getProcessInstanceId()))
+				.map(AjhPlanScheduleInfo::getProcessInstanceId).collect(Collectors.toSet());
+		Map<String, Map<String, String>> processInstanceMap;
+		try {
+			processInstanceMap = flowBusinessService.getProcessState(processInstanceIdSet);
+		} catch (Exception e) {
+			processInstanceMap = new HashMap<>();
+		}
+		for (AjhPlanScheduleInfo record : records) {
+			record.getFlow().setProcessDefinitionKey(processInstanceMap.getOrDefault(record.getProcessInstanceId(), new HashMap<>()).get("processDefinitionKey"));
+			record.getFlow().setTaskDefinitionKey(processInstanceMap.getOrDefault(record.getProcessInstanceId(), new HashMap<>()).get("taskDefinitionKey"));
+			record.getFlow().setStatus(processInstanceMap.getOrDefault(record.getProcessInstanceId(), new HashMap<>()).get("state"));
+			record.getFlow().setTaskName(processInstanceMap.getOrDefault(record.getProcessInstanceId(), new HashMap<>()).get("processDefinitionName"));
+		}
+
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	@AutoLog(value = "经营方案数据审批-开始流程")
+	@ApiOperation(value="经营方案数据审批-开始流程", notes="经营方案数据审批-开始流程")
+	@PostMapping(value = "/start-process")
+	public Result<AjhPlanScheduleInfo> startProcess(@RequestBody AjhPlanScheduleInfo ajhPlanScheduleInfo) {
+		Result<AjhPlanScheduleInfo> result = new Result<>();
+		try {
+			AjhPlanScheduleInfo data = ajhPlanScheduleInfoService.startProcess(ajhPlanScheduleInfo);
+			result.setResult(data);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	@AutoLog(value = "经营方案审批父类-获取详情信息")
+	@ApiOperation(value="经营方案审批父类-获取详情信息", notes="经营方案审批父类-获取详情信息")
+	@GetMapping(value = "/get")
+	public Result<AjhPlanScheduleInfo> getInfo(AjhPlanScheduleInfo ajhPlanScheduleInfo) {
+		Result<AjhPlanScheduleInfo> result = new Result<AjhPlanScheduleInfo>();
+		QueryWrapper<AjhPlanScheduleInfo> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("depart_id", ajhPlanScheduleInfo.getDepartId());
+		queryWrapper.eq("date_time", ajhPlanScheduleInfo.getDateTime());
+		List<AjhPlanScheduleInfo> list = ajhPlanScheduleInfoService.list(queryWrapper);
+		if(list.size() > 0){
+			Set<String> processInstanceIdSet = list.stream().filter(data-> StringUtils.isNotBlank(data.getProcessInstanceId()))
+					.map(AjhPlanScheduleInfo::getProcessInstanceId).collect(Collectors.toSet());
+			Map<String, Map<String, String>> processInstanceMap;
+			try {
+				processInstanceMap = flowBusinessService.getProcessState(processInstanceIdSet);
+			} catch (Exception e) {
+				processInstanceMap = new HashMap<>();
+			}
+			ajhPlanScheduleInfo = list.get(0);
+			ajhPlanScheduleInfo.getFlow().setProcessDefinitionKey(processInstanceMap.getOrDefault(ajhPlanScheduleInfo.getProcessInstanceId(), new HashMap<>()).get("processDefinitionKey"));
+			ajhPlanScheduleInfo.getFlow().setTaskDefinitionKey(processInstanceMap.getOrDefault(ajhPlanScheduleInfo.getProcessInstanceId(), new HashMap<>()).get("taskDefinitionKey"));
+			ajhPlanScheduleInfo.getFlow().setStatus(processInstanceMap.getOrDefault(ajhPlanScheduleInfo.getProcessInstanceId(), new HashMap<>()).get("state"));
+			ajhPlanScheduleInfo.getFlow().setTaskName(processInstanceMap.getOrDefault(ajhPlanScheduleInfo.getProcessInstanceId(), new HashMap<>()).get("processDefinitionName"));
+		}else{
+			ajhPlanScheduleInfo = new AjhPlanScheduleInfo();
+		}
+		result.setResult(ajhPlanScheduleInfo);
+		result.setSuccess(true);
+		return result;
+	}
+
+	/**
+	 * <pre>
+	 * 	添加
+	 * </pre>
+	 * @param ajhPlanScheduleInfo
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "经营方案审批父类-添加")
+	@ApiOperation(value="经营方案审批父类-添加", notes="经营方案审批父类-添加")
+	@PostMapping(value = "/add")
+	public Result<AjhPlanScheduleInfo> add(@RequestBody AjhPlanScheduleInfo ajhPlanScheduleInfo) {
+		Result<AjhPlanScheduleInfo> result = new Result<AjhPlanScheduleInfo>();
+		try {
+			ajhPlanScheduleInfoService.save(ajhPlanScheduleInfo);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 编辑
+	 * </pre>
+	 * @param ajhPlanScheduleInfo
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "经营方案审批父类-编辑")
+	@ApiOperation(value="经营方案审批父类-编辑", notes="经营方案审批父类-编辑")
+	@PutMapping(value = "/edit")
+	public Result<AjhPlanScheduleInfo> edit(@RequestBody AjhPlanScheduleInfo ajhPlanScheduleInfo) {
+		Result<AjhPlanScheduleInfo> result = new Result<AjhPlanScheduleInfo>();
+		AjhPlanScheduleInfo ajhPlanScheduleInfoEntity = ajhPlanScheduleInfoService.getById(ajhPlanScheduleInfo.getId());
+		if(ajhPlanScheduleInfoEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = ajhPlanScheduleInfoService.updateById(ajhPlanScheduleInfo);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id删除
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "经营方案审批父类-通过id删除")
+	@ApiOperation(value="经营方案审批父类-通过id删除", notes="经营方案审批父类-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			ajhPlanScheduleInfoService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 * <pre>
+	 * 	  批量删除
+	 * </pre>
+	 * @param ids
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "经营方案审批父类-批量删除")
+	@ApiOperation(value="经营方案审批父类-批量删除", notes="经营方案审批父类-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<AjhPlanScheduleInfo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<AjhPlanScheduleInfo> result = new Result<AjhPlanScheduleInfo>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.ajhPlanScheduleInfoService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id查询
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "经营方案审批父类-通过id查询")
+	@ApiOperation(value="经营方案审批父类-通过id查询", notes="经营方案审批父类-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<AjhPlanScheduleInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<AjhPlanScheduleInfo> result = new Result<AjhPlanScheduleInfo>();
+		AjhPlanScheduleInfo ajhPlanScheduleInfo = ajhPlanScheduleInfoService.getById(id);
+		if(ajhPlanScheduleInfo==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(ajhPlanScheduleInfo);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+   /**
+	 * <pre>
+	 * 	 导出excel
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<AjhPlanScheduleInfo> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (ConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              AjhPlanScheduleInfo ajhPlanScheduleInfo = JSON.parseObject(deString, AjhPlanScheduleInfo.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(ajhPlanScheduleInfo, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<AjhPlanScheduleInfo> pageList = ajhPlanScheduleInfoService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "经营方案审批父类列表");
+      mv.addObject(NormalExcelConstants.CLASS, AjhPlanScheduleInfo.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("经营方案审批父类列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+   /**
+	 * <pre>
+	 * 	 通过excel导入数据
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<AjhPlanScheduleInfo> listAjhPlanScheduleInfos = ExcelImportUtil.importExcel(file.getInputStream(), AjhPlanScheduleInfo.class, params);
+              ajhPlanScheduleInfoService.saveBatch(listAjhPlanScheduleInfos);
+              return Result.ok("文件导入成功！数据行数:" + listAjhPlanScheduleInfos.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

+package com.skua.modules.ajh.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
+import com.skua.modules.flow.core.entity.FlowEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 经营方案审批父类
+ */
+@Data
+@TableName("ajh_plan_schedule_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ajh_plan_schedule_info对象", description="经营方案审批父类")
+public class AjhPlanScheduleInfo extends FlowEntity {
+
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**所属厂站编号*/
+	@Excel(name = "所属厂站编号", width = 15)
+    @ApiModelProperty(value = "所属厂站编号")
+	@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
+	private String departId;
+	/**时间yyyy-MM*/
+	@Excel(name = "时间yyyy-MM", width = 15)
+    @ApiModelProperty(value = "时间yyyy-MM")
+	private String dateTime;
+	/**流程定义id*/
+	@Excel(name = "流程定义id", width = 15)
+    @ApiModelProperty(value = "流程定义id")
+	private String processDefinitionId;
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+	private String processInstanceId;
+	/**创建人Id*/
+	@Excel(name = "创建人Id", width = 15)
+    @ApiModelProperty(value = "创建人Id")
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**修改人Id*/
+	@Excel(name = "修改人Id", width = 15)
+    @ApiModelProperty(value = "修改人Id")
+	private String updateBy;
+	/**修改时间*/
+	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+}

+package com.skua.modules.ajh.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.ajh.entity.AjhPlanScheduleInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 经营方案审批父类
+ */
+public interface AjhPlanScheduleInfoMapper extends BaseMapper<AjhPlanScheduleInfo> {
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.ajh.mapper.AjhPlanScheduleInfoMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.ajh.service;
+
+import com.skua.modules.ajh.entity.AjhPlanScheduleInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 经营方案审批父类
+ */
+public interface IAjhPlanScheduleInfoService extends IService<AjhPlanScheduleInfo> {
+
+    AjhPlanScheduleInfo startProcess(AjhPlanScheduleInfo ajhPlanScheduleInfo);
+}

+package com.skua.modules.ajh.service.impl;
+
+import com.skua.core.exception.JeecgBootException;
+import com.skua.modules.ajh.entity.AjhPlanScheduleInfo;
+import com.skua.modules.ajh.mapper.AjhPlanScheduleInfoMapper;
+import com.skua.modules.ajh.service.IAjhPlanScheduleInfoService;
+import com.skua.modules.flow.business.service.IFlowService;
+import com.skua.modules.flow.core.constant.ProcessConstant;
+import com.skua.modules.flow.core.entity.BladeFlow;
+import com.skua.modules.flow.core.utils.FlowUtil;
+import com.skua.modules.flow.support.Kv;
+import com.skua.modules.flow.utils.Func;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 经营方案审批父类
+ */
+@Service
+public class AjhPlanScheduleInfoServiceImpl extends ServiceImpl<AjhPlanScheduleInfoMapper, AjhPlanScheduleInfo> implements IAjhPlanScheduleInfoService {
+
+    @Autowired
+    private IFlowService flowService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjhPlanScheduleInfo startProcess(AjhPlanScheduleInfo ajhPlanScheduleInfo) {
+        String businessTable = "ajh_plan_schedule_info";
+        this.saveOrUpdate(ajhPlanScheduleInfo);
+        // 启动流程
+        Kv variables = Kv.create().set(ProcessConstant.TASK_VARIABLE_CREATE_USER, "");
+        BladeFlow flow = flowService.startProcessInstanceById(ajhPlanScheduleInfo.getProcessDefinitionId(),
+                FlowUtil.getBusinessKey(businessTable, String.valueOf(ajhPlanScheduleInfo.getId())), variables);
+
+        if (Func.isNotEmpty(flow)){
+            log.debug("流程已启动,流程ID:" + flow.getProcessInstanceId());
+            // 返回流程id写入leave
+            ajhPlanScheduleInfo.setProcessInstanceId(flow.getProcessInstanceId());
+            updateById(ajhPlanScheduleInfo);
+        } else {
+            throw new JeecgBootException("开启流程失败");
+        }
+        return ajhPlanScheduleInfo;
+    }
+}

@@ -56,6 +56,22 @@ public class DataAssessmentInfo {
     @Excel(name = "考核厂站", width = 15)
     @Excel(name = "考核厂站", width = 15)
     @ApiModelProperty(value = "考核厂站")
     @ApiModelProperty(value = "考核厂站")
     private String asseDepartId;
     private String asseDepartId;
+
+    @Excel(name = "考核对象", width = 15)
+    @ApiModelProperty(value = "考核对象")
+    private String asseObject;
+
+    @Excel(name = "考核时间类型", width = 15)
+    @ApiModelProperty(value = "考核时间类型")
+    private String asseTimeType;
+
+    @Excel(name = "初试分数", width = 15)
+    @ApiModelProperty(value = "初试分数")
+    private String initScore;
+
+    @Excel(name = "是否展示总分", width = 15)
+    @ApiModelProperty(value = "是否展示总分")
+    private String isShowScore;
     /**
     /**
      * 标识
      * 标识
      */
      */

@@ -176,6 +176,20 @@ public class FlowBussinessDescManageServiceImpl implements IFlowBusinessDescServ
 					for (Map<String, Object> dataMap : dataList) {
 					for (Map<String, Object> dataMap : dataList) {
 						resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("title")));
 						resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("title")));
 					}
 					}
+				}else if(tableName.equals("ajh_plan_schedule_info")) {
+					//经营方案审批流程
+					String ids = tableMap.get(tableName).substring(1);
+					List<String> avgIndexCodeArray = Arrays.asList(ids.split(","));
+					String inSqlPart = avgIndexCodeArray.stream().map(s -> "'"+s.trim()+"'").collect(Collectors.joining(","));
+					String sql = "select s.id,CONCAT(d.depart_name,'[',s.date_time,']','-经营方案填报审批') as title " +
+							" from ajh_plan_schedule_info s " +
+							" left join sys_depart d on s.depart_id = d.id " +
+							" WHERE " +
+							"	s.id in ("+inSqlPart+")";
+					List<Map<String, Object>> dataList = masterDB.queryForList(sql);
+					for(Map<String, Object> dataMap : dataList) {
+						resultMap.put(ConvertUtils.getString(dataMap.get("id")), ConvertUtils.getString(dataMap.get("title")));
+					}
 				}
 				}
 			}
 			}
 		}
 		}

@@ -71,6 +71,9 @@ public class APPDangerInspectionRecordController {
         if(StringUtils.isNotBlank(dangerInspectionRecord.getEndTime())){
         if(StringUtils.isNotBlank(dangerInspectionRecord.getEndTime())){
             queryWrapper.le("report_date", dangerInspectionRecord.getEndTime() ) ;
             queryWrapper.le("report_date", dangerInspectionRecord.getEndTime() ) ;
         }
         }
+        if(StringUtils.isNotBlank(dangerInspectionRecord.getInspectionType())){
+            queryWrapper.eq("inspection_type", dangerInspectionRecord.getInspectionType() ) ;
+        }
         if(StringUtils.isNotBlank(dangerInspectionRecord.getDangerName())){
         if(StringUtils.isNotBlank(dangerInspectionRecord.getDangerName())){
             queryWrapper.like("danger_name", dangerInspectionRecord.getDangerName() ) ;
             queryWrapper.like("danger_name", dangerInspectionRecord.getDangerName() ) ;
         }
         }

@@ -41,7 +41,6 @@ public class DangerInspectionRecordVO {
     @ApiModelProperty(value = "巡检记录编号")
     @ApiModelProperty(value = "巡检记录编号")
     private String inspectionRecord;
     private String inspectionRecord;
 
 
-
     @Excel(name = "风险等级名称", width = 15)
     @Excel(name = "风险等级名称", width = 15)
     @ApiModelProperty(value = "风险等级名称")
     @ApiModelProperty(value = "风险等级名称")
     private String dangerName;
     private String dangerName;
@@ -52,6 +51,9 @@ public class DangerInspectionRecordVO {
     @ApiModelProperty(value = "风险区域名称")
     @ApiModelProperty(value = "风险区域名称")
     private String dangerPlace;
     private String dangerPlace;
 
 
+    @ApiModelProperty(value = "巡检类型")
+    private String inspectionType;
+
     @ApiModelProperty(value = "巡检状态(1:开始，2:结束)")
     @ApiModelProperty(value = "巡检状态(1:开始，2:结束)")
     private String status;
     private String status;