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

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

+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")));
+					}
 				}
 				}
 			}
 			}
 		}
 		}

@@ -69,7 +69,10 @@ public class APPDangerInspectionRecordController {
             queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
             queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
         }
         }
         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() ) ;

@@ -39,8 +39,7 @@ public class DangerInspectionRecordVO {
     private String equipInfoId;
     private String equipInfoId;
 
 
     @ApiModelProperty(value = "巡检记录编号")
     @ApiModelProperty(value = "巡检记录编号")
-    private String    inspectionRecord;
-
+    private String inspectionRecord;
 
 
     @Excel(name = "风险等级名称", width = 15)
     @Excel(name = "风险等级名称", width = 15)
     @ApiModelProperty(value = "风险等级名称")
     @ApiModelProperty(value = "风险等级名称")
@@ -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;