guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 解决合并冲突遗留问题

Browse Source
dev
shuliYao 1 year ago
parent a7c05737e5
commit acb62185a8
2 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
Unescape View File

@ -692,6 +692,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
if (this.saveBatch(ocrPictureList)) {
this.createTaskChild(ocrPictureList, ocrPictureList.get(0).getTenantId().toString());
return ocrPictureList.size();
}
return 0;

90
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
Unescape View File

@ -61,20 +61,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
OcrTaskchildPicture old = this.listPicturePackageId(childpictureid,Long.parseLong(packageid));
//如果是历史图片，不允许进行设置
if(old.isIzHistory()){
if(historyPname.length() > 0){
historyPname.append("," + old.getOcrPicture().getImgname());
}else{
historyPname.append(old.getOcrPicture().getImgname());
}
}
if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
if(taskType.length() > 0){
taskType.append("," + old.getOcrPicture().getImgname());
}else{
taskType.append(old.getOcrPicture().getImgname());
}
}
// if(old.isIzHistory()){
// if(historyPname.length() > 0){
// historyPname.append("," + old.getOcrPicture().getImgname());
// }else{
// historyPname.append(old.getOcrPicture().getImgname());
// }
// }
// if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
// if(taskType.length() > 0){
// taskType.append("," + old.getOcrPicture().getImgname());
// }else{
// taskType.append(old.getOcrPicture().getImgname());
// }
// }
OcrPicture ocrPicture = old.getOcrPicture();
ocrPicture.setJudgeid(Long.parseLong(judgeid));
@ -85,12 +85,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
saveList.add(ocrPicture);
}
if(StringUtils.isNotBlank(historyPname.toString())){
return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。");
}
else if(StringUtils.isNotBlank(taskType.toString())){
return ResultVoUtil.error( taskType.toString() + "已经审批，不能标记。");
}
// if(StringUtils.isNotBlank(historyPname.toString())){
// return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。");
// }
// else if(StringUtils.isNotBlank(taskType.toString())){
// return ResultVoUtil.error( taskType.toString() + "已经审批，不能标记。");
// }
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));
//如果是历史图片，不允许进行设置
if(old.isIzHistory()){
if(historyPname.length() > 0){
historyPname.append("," + old.getOcrPicture().getImgname());
}else{
historyPname.append(old.getOcrPicture().getImgname());
}
}
if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
if(taskType.length() > 0){
taskType.append("," + old.getOcrPicture().getImgname());
}else{
taskType.append(old.getOcrPicture().getImgname());
}
}
// if(old.isIzHistory()){
// if(historyPname.length() > 0){
// historyPname.append("," + old.getOcrPicture().getImgname());
// }else{
// historyPname.append(old.getOcrPicture().getImgname());
// }
// }
// if(old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
// if(taskType.length() > 0){
// taskType.append("," + old.getOcrPicture().getImgname());
// }else{
// taskType.append(old.getOcrPicture().getImgname());
// }
// }
OcrPicture ocrPicture = old.getOcrPicture();
ocrPicture.setJudgeid(null);
@ -131,12 +131,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
saveList.add(ocrPicture);
}
if(StringUtils.isNotBlank(historyPname.toString())){
return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。");
}
else if(StringUtils.isNotBlank(taskType.toString())){
return ResultVoUtil.error( taskType.toString() + "已经审批，不能清除标记。");
}
// if(StringUtils.isNotBlank(historyPname.toString())){
// return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。");
// }
// else if(StringUtils.isNotBlank(taskType.toString())){
// return ResultVoUtil.error( taskType.toString() + "已经审批，不能清除标记。");
// }
return this.ocrPictureService.updateBatchById(saveList)?ResultVoUtil.success():ResultVoUtil.error();
}
@ -215,8 +215,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
}
return true;
}
/**
* 判断任务是否已经审批
*
@ -233,7 +233,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
}
return true;
}
@Override
public List<OcrTaskchildPicture> listAll(String tenantId, String createUser, QueryWrapper queryWrapper){
@ -510,7 +510,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
public Long listFinalCount(Map<String, Object> query){
return this.ocrtaskchildpicturemybatisdao.listFinalCount(query);
}
/**
* 查询所有业务表集合
* @param query
@ -519,7 +519,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
public List<OcrTaskchildPictureAppro> listmytask(Map<String, Object> query){
return this.ocrtaskchildpicturemybatisdao.listmytask(query);
}
public Long listmytaskCount(Map<String, Object> query){
return this.ocrtaskchildpicturemybatisdao.listmytaskCount(query);
}

Write Preview
Loading…
Cancel
Save