|
|
@ -62,20 +62,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
|
|
|
|
OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
|
|
|
|
|
|
|
|
|
|
|
|
//如果是历史图片,不允许进行设置
|
|
|
|
//如果是历史图片,不允许进行设置
|
|
|
|
if (old.isIzHistory()) {
|
|
|
|
// if (old.isIzHistory()) {
|
|
|
|
if (historyPname.length() > 0) {
|
|
|
|
// if (historyPname.length() > 0) {
|
|
|
|
historyPname.append("," + old.getOcrPicture().getImgname());
|
|
|
|
// historyPname.append("," + old.getOcrPicture().getImgname());
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
historyPname.append(old.getOcrPicture().getImgname());
|
|
|
|
// historyPname.append(old.getOcrPicture().getImgname());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
|
|
|
|
// if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
|
|
|
|
if (taskType.length() > 0) {
|
|
|
|
// if (taskType.length() > 0) {
|
|
|
|
taskType.append("," + old.getOcrPicture().getImgname());
|
|
|
|
// taskType.append("," + old.getOcrPicture().getImgname());
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
taskType.append(old.getOcrPicture().getImgname());
|
|
|
|
// taskType.append(old.getOcrPicture().getImgname());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
OcrPicture ocrPicture = old.getOcrPicture();
|
|
|
|
OcrPicture ocrPicture = old.getOcrPicture();
|
|
|
|
ocrPicture.setJudgeid(Long.parseLong(judgeid));
|
|
|
|
ocrPicture.setJudgeid(Long.parseLong(judgeid));
|
|
|
@ -86,11 +86,11 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
saveList.add(ocrPicture);
|
|
|
|
saveList.add(ocrPicture);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(historyPname.toString())) {
|
|
|
|
// if (StringUtils.isNotBlank(historyPname.toString())) {
|
|
|
|
return ResultVoUtil.error(historyPname.toString() + "为历史数据,不能标记。");
|
|
|
|
// return ResultVoUtil.error(historyPname.toString() + "为历史数据,不能标记。");
|
|
|
|
} else if (StringUtils.isNotBlank(taskType.toString())) {
|
|
|
|
// } else if (StringUtils.isNotBlank(taskType.toString())) {
|
|
|
|
return ResultVoUtil.error(taskType.toString() + "已经审批,不能标记。");
|
|
|
|
// return ResultVoUtil.error(taskType.toString() + "已经审批,不能标记。");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
|
|
|
|
return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -107,20 +107,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
|
|
|
|
OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
|
|
|
|
|
|
|
|
|
|
|
|
//如果是历史图片,不允许进行设置
|
|
|
|
//如果是历史图片,不允许进行设置
|
|
|
|
if (old.isIzHistory()) {
|
|
|
|
// if (old.isIzHistory()) {
|
|
|
|
if (historyPname.length() > 0) {
|
|
|
|
// if (historyPname.length() > 0) {
|
|
|
|
historyPname.append("," + old.getOcrPicture().getImgname());
|
|
|
|
// historyPname.append("," + old.getOcrPicture().getImgname());
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
historyPname.append(old.getOcrPicture().getImgname());
|
|
|
|
// historyPname.append(old.getOcrPicture().getImgname());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
|
|
|
|
// if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
|
|
|
|
if (taskType.length() > 0) {
|
|
|
|
// if (taskType.length() > 0) {
|
|
|
|
taskType.append("," + old.getOcrPicture().getImgname());
|
|
|
|
// taskType.append("," + old.getOcrPicture().getImgname());
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
taskType.append(old.getOcrPicture().getImgname());
|
|
|
|
// taskType.append(old.getOcrPicture().getImgname());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
OcrPicture ocrPicture = old.getOcrPicture();
|
|
|
|
OcrPicture ocrPicture = old.getOcrPicture();
|
|
|
|
ocrPicture.setJudgeid(null);
|
|
|
|
ocrPicture.setJudgeid(null);
|
|
|
@ -131,11 +131,11 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
saveList.add(ocrPicture);
|
|
|
|
saveList.add(ocrPicture);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(historyPname.toString())) {
|
|
|
|
// if (StringUtils.isNotBlank(historyPname.toString())) {
|
|
|
|
return ResultVoUtil.error(historyPname.toString() + "为历史数据,不能清除标记。");
|
|
|
|
// return ResultVoUtil.error(historyPname.toString() + "为历史数据,不能清除标记。");
|
|
|
|
} else if (StringUtils.isNotBlank(taskType.toString())) {
|
|
|
|
// } else if (StringUtils.isNotBlank(taskType.toString())) {
|
|
|
|
return ResultVoUtil.error(taskType.toString() + "已经审批,不能清除标记。");
|
|
|
|
// return ResultVoUtil.error(taskType.toString() + "已经审批,不能清除标记。");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
|
|
|
|
return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
|
|
|
|
}
|
|
|
|
}
|
|
|
|