sangwenwei 1 year ago
parent
commit
3d82e1921d

+ 3 - 2
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/humanResources/controller/StaffUserInfoController.java

@@ -13,6 +13,7 @@ import com.jeeplus.business.humanResources.service.dto.StaffUserInfoDTO;
 import com.jeeplus.business.humanResources.service.dto.UserInfo;
 import com.jeeplus.business.humanResources.utils.IdCardUtil;
 import com.jeeplus.business.monthly.service.dto.MonthlyDTO;
+import com.jeeplus.common.excel.EasyExcelUtils;
 import com.jeeplus.common.excel.ExcelOptions;
 import com.jeeplus.common.excel.annotation.ExportMode;
 import com.jeeplus.common.utils.ResponseUtil;
@@ -21,7 +22,7 @@ import com.jeeplus.logging.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.feign.IOfficeApi;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 
-import com.jeeplus.sys.utils.excel.UserEasyExcel;
+
 import com.jeeplus.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -117,7 +118,7 @@ public class StaffUserInfoController {
     public void importFileTemplate(HttpServletResponse response, HttpServletRequest request) throws IOException {
         String fileName = "用户数据导入模板.xlsx";
         List <UserInfo> list = Lists.newArrayList ( );
-        UserEasyExcel.newInstance ( ).exportExcel ( list, "用户数据", UserInfo.class, fileName, null, response );
+        EasyExcelUtils.newInstance ( ).exportExcel ( list, "用户数据", UserInfo.class, fileName, null, response );
     }
 
     /**

+ 2 - 3
jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/notify/service/JyNotifyService.java

@@ -29,14 +29,13 @@ import com.jeeplus.business.project.domain.JyProjectEiaQualificationFile;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.constant.CommonConstants;
 import com.jeeplus.common.utils.CommonUtils;
-import com.jeeplus.notify.domain.Notify;
+
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.utils.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.beans.BeanUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;