修改任务审批插入数据项值的方法

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndicatorsDataMapper.java

@@ -18,7 +18,8 @@ public interface IndicatorsDataMapper extends BaseMapper<IndicatorsData>{
 
 	void batchCreateIndData(@Param("datas") List<IndicatorsData> datas);
 
-	void deleteData(@Param("indId") String indId, @Param("dim1")String dim1, @Param("dim2")Integer dim2);
+	void deleteData(@Param("indId") String indId, @Param("dim1")String dim1,
+					@Param("dim2")Integer dim2, @Param("code")String code);
 
 	public IndicatorsData getIndData(@Param("indId")String indId,
 			@Param("date")Integer date,@Param("compareObj")String compareObj,@Param("code")String code);

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -510,6 +510,7 @@ public class TaskServiceImpl implements TaskService {
                                  List<IndicatorsData> datas) {
         IndicatorsData data = new IndicatorsData();
         data.setBatchNo(task.getId());
+        data.setCode(task.getOrgNo());
         data.setDataType("double");
         data.setDim2(valueTime);
         data.setDim1(value.getObjId());

src/main/java/com/keymobile/indicators/service/hytobacco/BaseIndDataService.java

@@ -64,7 +64,7 @@ public class BaseIndDataService {
 		log.info("开始批量插入指标值数据项");
 		long time = System.currentTimeMillis();
 		for (IndicatorsData data : datas) {
-			indicatorsDataMapper.deleteData(data.getIndId(), data.getDim1(), data.getDim2());
+			indicatorsDataMapper.deleteData(data.getIndId(), data.getDim1(), data.getDim2(), data.getCode());
 		}
 		indicatorsDataMapper.batchCreateIndData(datas);
 		time = (System.currentTimeMillis() - time)/1000;

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

@@ -34,6 +34,9 @@
 		where ind_id = #{indId}
 		and dim1 = #{dim1}
 		and dim2 = #{dim2}
+		<if test="code != null">
+			and code = #{code}
+		</if>
 	</delete>
 	
 	<select id="getIndData" parameterType="map" resultType="com.keymobile.indicators.model.entity.indicators.IndicatorsData" >