证照申请保存二维码

one-certificate-manager/src/main/java/com/mortals/xhx/common/utils/ReadExcelPictureUtil.java

@@ -59,7 +59,7 @@ public class ReadExcelPictureUtil {
             File picDirF = null;
 
             String imageName = new Date().getTime() + ".png";
-            String imagePath = "/file/uploadfile/"+imageName;
+            String imagePath = "/file/fileupload/"+imageName;
             String filePath = root + imagePath;
 
             FileOutputStream fout;
@@ -101,7 +101,7 @@ public class ReadExcelPictureUtil {
                         String point = hSSFClientAnchor.getRow1() + "," + hSSFClientAnchor.getCol1();
 
                         String imageName = new Date().getTime() + ".png";
-                        String imagePath = "/file/uploadfile/"+imageName;
+                        String imagePath = "/file/fileupload/"+imageName;
                         String filePath = "D:/mortals/app/data/cpm" + imagePath;
 
                         FileOutputStream fout;

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java

@@ -70,6 +70,7 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
                     entity.setBusinessPlace(applyLogEntity.getBusinessPlace());
                     entity.setLicensedItems(applyLogEntity.getLicenseProject());
                     entity.setFormStyleContent(item.getTemplateContent());
+                    entity.setFormContent(item.getFormContent());
                     entity.setProcessStatus(ProcessStatusEnum.未处理.getValue());
                     entity.setCreateTime(applyLogEntity.getCreateTime());
                     entity.setCreateUserId(applyLogEntity.getCreateUserId());

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java

@@ -25,4 +25,6 @@ public class ApplyLogVo extends BaseEntityLong {
     /** 子证信息 */
     List<ChildLicenseEntity> childLicense;
 
+    private String processStatus;
+
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java

@@ -128,6 +128,18 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
         return query;
     }
 
+    @Override
+    protected void findAfter(ApplyLogEntity params, PageInfo pageInfo, Context context, List<ApplyLogEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for(ApplyLogEntity entity:list){
+                List<ChildLicenseEntity> childLicenseList = childLicenseService.find(new ChildLicenseQuery().applyId(entity.getId()));
+                Map<Integer,List<ChildLicenseEntity>> group = childLicenseList.stream().collect(Collectors.groupingBy(x->x.getProcessStatus()));
+                int pCount = group.get(1).size();
+                entity.setProcessStatus(pCount+"/"+childLicenseList.size());
+            }
+        }
+    }
+
     @Override
     protected void validData(ApplyLogEntity entity, Context context) throws AppException {
         if(StringUtils.isEmpty(entity.getCertificateCode())){