修改驳回消息详情

src/main/java/com/keymobile/indicators/akka/actor/indicators/BeforeCompareUnitCalActor.java

@@ -143,8 +143,8 @@ public class BeforeCompareUnitCalActor extends AbstractActor{
 									indicatorsReportService.dealBaseIndReportOneData(currentDate, compareObjs, code);
 								}
 
-								//整合考核指标报表数据3
-								logger.info("进行date:"+currentDate+" 指标报表3数据整合");
+								//整合考核指标报表数据3,和报表四
+								logger.info("进行date:"+currentDate+" 指标报表3，4数据整合");
 								//删除历史数据
 								indicatorsReportService.deleteReportThreeDataByParam(path,currentDate,
 										new ArrayList<String>(compareObjMap.keySet()),code);

src/main/java/com/keymobile/indicators/model/entity/report/IndicatorsReportFour.java

+package com.keymobile.indicators.model.entity.report;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Description  
+ * @Author  hzc
+ * @Date 2020-12-18 
+ */
+@Data
+@Table ( name ="indicators_report_four" )
+public class IndicatorsReportFour  implements Serializable {
+
+	private static final long serialVersionUID =  3424539524437039425L;
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+   	@Column(name = "id" )
+	private Integer id;
+
+	/**
+	 * 结果表id
+	 */
+   	@Column(name = "result_id" )
+	private Integer resultId;
+
+	/**
+	 * 对标单元id
+	 */
+   	@Column(name = "compare_id" )
+	private Integer compareId;
+
+	/**
+	 * 指标id
+	 */
+   	@Column(name = "ind_id" )
+	private String indId;
+
+	/**
+	 * 指标名称
+	 */
+   	@Column(name = "ind_name" )
+	private String indName;
+
+	/**
+	 * 对标对象id
+	 */
+   	@Column(name = "compare_obj" )
+	private String compareObj;
+
+	/**
+	 * 对标对象描述
+	 */
+   	@Column(name = "compare_obj_desc" )
+	private String compareObjDesc;
+
+	/**
+	 * 指标正负属性：正向指标0   反向指标1
+	 */
+   	@Column(name = "indRule" )
+	private String indRule;
+
+	/**
+	 * 对标维度
+	 */
+   	@Column(name = "compare_date" )
+	private Integer compareDate;
+
+	/**
+	 * 指标值
+	 */
+   	@Column(name = "value" )
+	private String value;
+
+	/**
+	 * 平均值
+	 */
+   	@Column(name = "average" )
+	private String average;
+
+	/**
+	 * 机构编码
+	 */
+   	@Column(name = "code" )
+	private String code;
+
+	/**
+	 * 同比趋势   0：趋好    1：趋坏
+	 */
+   	@Column(name = "trend" )
+	private Integer trend;
+
+	/**
+	 * 排名标识，1,2,3前三
+	 */
+   	@Column(name = "rank_mark_before" )
+	private Integer rankMarkBefore;
+	/**
+	 * 排名标识，1,2,3末三
+	 */
+	@Column(name = "rank_mark_after" )
+	private Integer rankMarkAfter;
+	/**
+	 * 对比平均数1大于，2等于，3小于
+	 */
+   	@Column(name = "compare_avg" )
+	private Integer compareAvg;
+
+	/**
+	 * 对标目录
+	 */
+   	@Column(name = "compare_catalog" )
+	private String compareCatalog;
+
+}

src/main/java/com/keymobile/indicators/model/mapper/report/IndicatorsReportFourMapper.java

+package com.keymobile.indicators.model.mapper.report;
+
+import com.keymobile.indicators.model.entity.report.IndicatorsReportFour;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author hzc
+ * @version 1.0
+ * @date 2020/12/18
+ */
+@Mapper
+public interface IndicatorsReportFourMapper extends BaseMapper<IndicatorsReportFour> {
+    void batchInsert(@Param("indicatorsReportFours") List<IndicatorsReportFour> indicatorsReportFours);
+
+    void deleteByCompareCatalog(String compareCatalog);
+}

src/main/resources/mybatis/mapping/IndicatorsReportFourMapper.xml

+<?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.keymobile.indicators.model.mapper.report.IndicatorsReportFourMapper">
+
+    
+    <insert id="batchInsert" parameterType="java.util.List">
+		insert into indicators_report_four(
+		result_id,compare_id,ind_id,ind_name,compare_obj,compare_obj_desc,ind_rule,compare_date,`value`,average,code,
+		trend,rank_mark_before,rank_mark_after,compare_avg,compare_catalog)
+  		values
+		<foreach collection="indicatorsReportFours" item="val" separator=",">
+			(
+            #{val.resultId},#{val.compareId},#{val.indId},#{val.indName},#{val.compareObj},#{val.compareObjDesc},#{val.indRule},
+            #{val.compareDate},#{val.value},#{val.average},#{val.code},#{val.trend},#{val.rankMarkBefore},#{val.rankMarkAfter},
+            #{val.compareAvg},#{val.compareCatalog}
+			)
+		</foreach>
+	</insert>
+
+	<delete id="deleteByCompareCatalog">
+		delete from indicators_report_four where compare_catalog=#{compareCatalog}
+	</delete>
+
+</mapper>
\ No newline at end of file