Merge remote-tracking branch 'origin/first' into first

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

@@ -15,6 +15,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 import com.mortals.xhx.module.certificate.model.CertificateClassifyQuery;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
 import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
+import com.mortals.xhx.module.record.dao.ApplyLogDao;
 import com.mortals.xhx.module.record.dao.PrintLogDao;
 import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
 import com.mortals.xhx.module.record.dao.RetainLogDao;
@@ -61,7 +62,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
     @Autowired
     private ParamService paramService;
     @Autowired
-    private ApplyLogService applyLogService;
+    private ApplyLogDao applyLogDao;
 
     @Override
     protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException {
@@ -158,7 +159,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
 
     private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
 
-        ApplyLogEntity applyLogEntity = applyLogService.get(waitQueueEntity.getApplyId());
+        ApplyLogEntity applyLogEntity = applyLogDao.get(waitQueueEntity.getApplyId());
         Date now = new Date();
 
 
@@ -210,6 +211,6 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
         updateApply.setCatalogId(applyLogEntity.getCatalogId());
         updateApply.setRecordStatus(YesNoEnum.YES.getValue());
         updateApply.setUpdateTime(new Date());
-        applyLogService.update(updateApply);
+        applyLogDao.update(updateApply);
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java

 package com.mortals.xhx.module.record.web;
+
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.BaseEntity;
-import com.mortals.framework.utils.ReflectUtils;
-import com.mortals.framework.utils.poi.ExcelUtil;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
-import com.mortals.xhx.common.code.*;
+import com.mortals.xhx.common.code.GenerateStatus;
+import com.mortals.xhx.common.code.HolderIdType;
+import com.mortals.xhx.common.code.HolderType;
+import com.mortals.xhx.common.code.StatusEnum;
 import com.mortals.xhx.common.utils.ImportExcelUtil;
 import com.mortals.xhx.common.utils.ReadExcelPictureUtil;
-import com.mortals.xhx.module.certificate.model.*;
+import com.mortals.xhx.module.certificate.model.CertificateCatalogQuery;
+import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity;
+import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
 import com.mortals.xhx.module.certificate.model.vo.CertificateDocumentPdu;
 import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
 import com.mortals.xhx.module.certificate.service.CertificateDocumentService;
 import com.mortals.xhx.module.certificate.service.CertificateIndustryService;
-import net.coobird.thumbnailator.Thumbnailator;
-import net.coobird.thumbnailator.Thumbnails;
+import com.mortals.xhx.module.record.model.ApplyLogEntity;
+import com.mortals.xhx.module.record.service.ApplyLogService;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.swing.*;
-
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.record.model.ApplyLogEntity;
-import com.mortals.xhx.module.record.service.ApplyLogService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
+
 import static java.util.stream.Collectors.toMap;
 
 /**