Commit c7dc8010 by 涂亚平

人社局测试

1 parent b06c404d
...@@ -41,6 +41,9 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -41,6 +41,9 @@ public class RenSheJuServiceImpl implements RenSheJuService {
@Autowired @Autowired
RenshejuHistoryMapper renshejuHistoryMapper; RenshejuHistoryMapper renshejuHistoryMapper;
@Autowired
private ImageCheckRecordMapper imageCheckRecordMapper;
public RensheResponseVO classBaseInfo() throws IOException { public RensheResponseVO classBaseInfo() throws IOException {
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
...@@ -449,12 +452,26 @@ public class RenSheJuServiceImpl implements RenSheJuService { ...@@ -449,12 +452,26 @@ public class RenSheJuServiceImpl implements RenSheJuService {
if (classImageChecksVOS2.size() > 0) { if (classImageChecksVOS2.size() > 0) {
for (ClassImageChecksVO cicon : classImageChecksVOS2) { for (ClassImageChecksVO cicon : classImageChecksVOS2) {
int count = imageCheckRecordMapper.selectCount(new QueryWrapper<ImageCheckRecordDO>()
.lambda()
.eq(ImageCheckRecordDO::getResult, 1)
.isNull(ImageCheckRecordDO::getPaperId)
.eq(ImageCheckRecordDO::getMemberId, cicon.getMemberId())
.eq(ImageCheckRecordDO::getClassId, cicon.getClassId()));
ImageDetailList imageDetailList = new ImageDetailList(); ImageDetailList imageDetailList = new ImageDetailList();
BeanUtils.copyProperties(cicon, imageDetailList); BeanUtils.copyProperties(cicon, imageDetailList);
imageDetailList.setImageBase64("data:image/jpeg;base64," + OSSUtils.image2Base64(cicon.getImage())); imageDetailList.setImageBase64("data:image/jpeg;base64," + OSSUtils.image2Base64(cicon.getImage()));
if (count == 1) {
imageDetailList.setProcessType(0L); imageDetailList.setProcessType(0L);
imageDetailList.setDetectionType(0L); imageDetailList.setDetectionType(0L);
imageDetailLists.add(imageDetailList); imageDetailLists.add(imageDetailList);
} else if (count == 2) {
imageDetailList.setProcessType(1L);
imageDetailList.setDetectionType(1L);
imageDetailLists.add(imageDetailList);
}
imageDetailLists.add(imageDetailList);
} }
uploadImage.setImageDetailList(imageDetailLists); uploadImage.setImageDetailList(imageDetailLists);
......
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
t2.user_name AS studentName, t2.user_name AS studentName,
t2.id_card AS identity, t2.id_card AS identity,
t2.telephone AS phone, t2.telephone AS phone,
UNIX_TIMESTAMP( t1.create_date )* 1000 AS activityTime UNIX_TIMESTAMP( t1.update_date )* 1000 AS activityTime
FROM FROM
image_check_record t1 image_check_record t1
LEFT JOIN member t2 ON t1.member_id = t2.id LEFT JOIN member t2 ON t1.member_id = t2.id
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!