修改工作人员导入

base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java

@@ -110,6 +110,7 @@ public class WorkmanEntity extends WorkmanVo {
     /**
      * 照片
      */
+    @Excel(name = "照片",height = 90, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.IMAGE)
     private String photoPath;
     /**
      * 岗位职责

base-manager/src/main/java/com/mortals/xhx/module/workman/model/vo/WorkmanVo.java

 package com.mortals.xhx.module.workman.model.vo;
 
+import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import lombok.Data;
+import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -14,4 +16,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 public class WorkmanVo extends BaseEntityLong {
     private String oldPwd;
     private String newPwd;
+
+    /**
+     * 证件图片附件
+     */
+    @Excel(name = "证件图片", type = Excel.Type.IMPORT, cellType = Excel.ColumnType.IMAGE)
+    private PictureData picObj;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.FileUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.annotation.Operlog;
@@ -15,6 +16,7 @@ import com.mortals.xhx.base.system.role.model.RoleUserEntity;
 import com.mortals.xhx.base.system.role.model.RoleUserQuery;
 import com.mortals.xhx.base.system.role.service.RoleService;
 import com.mortals.xhx.base.system.role.service.RoleUserService;
+import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
@@ -35,6 +37,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -58,6 +62,10 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     private DeptService deptService;
     @Autowired
     private WindowService windowService;
+    @Autowired
+    private UploadService uploadService;
+
+
 
     public WorkmanController() {
         super.setModuleDesc("工作人员");
@@ -129,12 +137,11 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
      */
     @Override
     public void doImportDataBefore(List<WorkmanEntity> list, boolean updateSupport, Context context) throws AppException {
-        String queryString = request.getQueryString();
         String siteId = request.getParameter("siteId");
         String deptId = request.getParameter("deptId");
         String windowId = request.getParameter("windowId");
 
-        log.info("queryString:{},siteId:{},deptId:{},windowId:{},", queryString, siteId, deptId, windowId);
+        log.info("siteId:{},deptId:{},windowId:{},", siteId, deptId, windowId);
         SiteEntity siteEntity = null;
         DeptEntity deptEntity = null;
         WindowEntity windowEntity = null;
@@ -161,6 +168,20 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
                 workmanEntity.setWindowId(windowEntity.getId());
                 workmanEntity.setWindowName(windowEntity.getName());
             }
+
+            if (!ObjectUtils.isEmpty(workmanEntity.getPicObj())) {
+                String extension = workmanEntity.getPicObj().suggestFileExtension();
+                String newName = "/file/uploadfile/" + new Date().getTime() + "." + extension;
+                String filePath = uploadService.getFilePath(newName);
+                try {
+                    boolean bool = FileUtil.write(filePath, workmanEntity.getPicObj().getData(), true, true);
+                    if (bool) {
+                        workmanEntity.setPhotoPath(newName);
+                    }
+                } catch (IOException e) {
+                    log.error("写入证照异常",e);
+                }
+            }
         }
 
         super.doImportDataBefore(list, updateSupport, context);