Merge branch 'dev' into pre-production

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java

@@ -27,6 +27,8 @@ public class IndicatorsDTO extends IndicatorsEntity {
 	private Date start;
 	private Date end;
 
+	private Integer isCommit;
+
 	private String createDeptName;
 
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java

@@ -107,6 +107,13 @@ public class ClassifyApi {
 		return r;
 	}
 
+	@GetMapping("/cancelMyApiIndicators")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "我被考核的列表")
+	public R cancelMyApiIndicators(@RequestParam Long id) {
+		return R.status(classifyService.removeById(id));
+	}
+
 	@GetMapping("/deptList")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我被考核的列表")

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -444,11 +444,14 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			handleResource(instanceofDTO.getResourceList(), instanceofDTO.getId());
 		}
 		IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class);
-		if (Func.isNotEmpty(instanceofDTO.getObjectionRemark())){
+		if (Func.isNotEmpty(instanceofDTO.getAppealReason())){
 			indicatorsEntity.setIsObjection(1);
+		}
+		if (1 ==instanceofDTO.getIsCommit()){
 			indicatorsEntity.setIndicatorsStatus(2);
 
 		}
+
 		return R.status(iIndicatorsService.updateById(indicatorsEntity));
 	}