Commit 9453eadb authored by 廖旭伟's avatar 廖旭伟

bug修改

parent caf6d1d9
...@@ -133,9 +133,13 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -133,9 +133,13 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
for(ApplyLogEntity entity:list){ for(ApplyLogEntity entity:list){
List<ChildLicenseEntity> childLicenseList = childLicenseService.find(new ChildLicenseQuery().applyId(entity.getId())); List<ChildLicenseEntity> childLicenseList = childLicenseService.find(new ChildLicenseQuery().applyId(entity.getId()));
Map<Integer,List<ChildLicenseEntity>> group = childLicenseList.stream().collect(Collectors.groupingBy(x->x.getProcessStatus())); if(CollectionUtils.isEmpty(childLicenseList)){
int pCount = group.get(1).size(); entity.setProcessStatus("0/0");
entity.setProcessStatus(pCount+"/"+childLicenseList.size()); }else {
Map<Integer, List<ChildLicenseEntity>> group = childLicenseList.stream().collect(Collectors.groupingBy(x -> x.getProcessStatus()));
int pCount = CollectionUtils.isEmpty(group.get(1)) ? 0 : group.get(1).size();
entity.setProcessStatus(pCount + "/" + childLicenseList.size());
}
} }
} }
} }
...@@ -199,7 +203,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -199,7 +203,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
pathDir.mkdirs(); pathDir.mkdirs();
} }
String imagepath = filePath + qrcodeName; String imagepath = filePath + qrcodeName;
String qrCode = serviceUrl+"/apply/log/get/"+applyLogEntity.getSocialCode(); String qrCode = serviceUrl+applyLogEntity.getSocialCode();
QrCodeUtil.generateQrCodeFile(qrCode,imagepath); QrCodeUtil.generateQrCodeFile(qrCode,imagepath);
applyLogEntity.setQRCode(imagepath); applyLogEntity.setQRCode(imagepath);
//entry.setValue(pictureRenderData); //entry.setValue(pictureRenderData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment