|
|
@ -303,7 +303,7 @@ public class OcrPictureController extends BaseController {
|
|
|
|
String iztaskstatus = req.getParameter("iztaskstatus");
|
|
|
|
String iztaskstatus = req.getParameter("iztaskstatus");
|
|
|
|
if (StringUtils.isNotBlank(iztaskstatus)) {
|
|
|
|
if (StringUtils.isNotBlank(iztaskstatus)) {
|
|
|
|
Integer taskStatus = Integer.parseInt(iztaskstatus);
|
|
|
|
Integer taskStatus = Integer.parseInt(iztaskstatus);
|
|
|
|
queryWrapper.apply("taskchildpictureid IN (SELECT ID FROM ocr_taskchild_picture WHERE STATES = {0})", taskStatus);
|
|
|
|
queryWrapper.apply("id IN (SELECT PICTUREID FROM ocr_taskchild_picture WHERE STATES = {0})", taskStatus);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -326,7 +326,7 @@ public class OcrPictureController extends BaseController {
|
|
|
|
List<OcrPicture> ocrPicturesNew = new ArrayList<>();
|
|
|
|
List<OcrPicture> ocrPicturesNew = new ArrayList<>();
|
|
|
|
for (OcrPicture ocrPictureOne : ocrPictures) {
|
|
|
|
for (OcrPicture ocrPictureOne : ocrPictures) {
|
|
|
|
LambdaQueryWrapper<OcrTaskchildPicture> ocrTaskchildPictureLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
LambdaQueryWrapper<OcrTaskchildPicture> ocrTaskchildPictureLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
ocrTaskchildPictureLambdaQueryWrapper.eq(OcrTaskchildPicture::getId, ocrPictureOne.getTaskchildpictureid());
|
|
|
|
ocrTaskchildPictureLambdaQueryWrapper.eq(OcrTaskchildPicture::getPictureid, ocrPictureOne.getId());
|
|
|
|
OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(ocrTaskchildPictureLambdaQueryWrapper);
|
|
|
|
OcrTaskchildPicture ocrTaskchildPicture = ocrTaskchildPictureService.getOne(ocrTaskchildPictureLambdaQueryWrapper);
|
|
|
|
if(ocrTaskchildPicture != null && ocrTaskchildPicture.getStates() != null){
|
|
|
|
if(ocrTaskchildPicture != null && ocrTaskchildPicture.getStates() != null){
|
|
|
|
switch (ocrTaskchildPicture.getStates()) {
|
|
|
|
switch (ocrTaskchildPicture.getStates()) {
|
|
|
|