feats

pom.xml

@@ -80,7 +80,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>easyexcel</artifactId>
-			<version>2.0.4</version>
+			<version>3.0.5</version>
 		</dependency>
 		<!--excel end-->
 

src/main/java/com/njyunzhi/ubpa/common/excelConverter/LocalDateTimeConverter.java

@@ -0,0 +1,39 @@
+package com.njyunzhi.ubpa.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.njyunzhi.ubpa.common.DateUtils;
+
+import java.time.LocalDateTime;
+
+public class LocalDateTimeConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 Excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+
+        String val = DateUtils.toString(value, "yyyy-MM-dd HH:mm:ss");
+
+        return new WriteCellData(val);
+    }
+}

src/main/java/com/njyunzhi/ubpa/common/excelConverter/ResultStatusConverter.java

@@ -0,0 +1,49 @@
+package com.njyunzhi.ubpa.common.excelConverter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class ResultStatusConverter implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Integer.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    /**
+     * 写 excel
+     * @param value
+     * @param contentProperty
+     * @param globalConfiguration
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public WriteCellData<?> convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        String result = null;
+        if (null == value) return null;
+
+        final int on = 1;
+        final int off = 0;
+
+        switch (value) {
+            case on:
+                result = "正常";
+                break;
+            case off:
+                result = "异常";
+                break;
+            default:
+                break;
+        }
+
+        return new WriteCellData(result);
+    }
+}

src/main/java/com/njyunzhi/ubpa/config/CorsConfig.java

@@ -23,7 +23,7 @@ public class CorsConfig implements WebMvcConfigurer {
                 //是否发送Cookie
                 .allowCredentials(true)
                 //设置放行哪些原始域
-                .allowedOrigins("http://localhost:8000")
+                .allowedOrigins("http://localhost:8000", "http://localhost:3000")
                 //放行哪些请求方式
                 .allowedMethods("GET", "POST", "PUT", "DELETE")
                 //.allowedMethods("*") //或者放行全部

src/main/java/com/njyunzhi/ubpa/controller/TaOrgController.java

@@ -62,7 +62,7 @@ public class TaOrgController extends BaseController {
         QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", Constants.STATUS_NORMAL);
         queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
-        queryWrapper.orderByDesc("org_name");
+        queryWrapper.orderByAsc("org_name");
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaOrg> result = iTaOrgService.page(pg, queryWrapper);

src/main/java/com/njyunzhi/ubpa/controller/TaResumeWorkFormController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.ubpa.common.*;
+import com.njyunzhi.ubpa.vo.FormExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,7 +20,10 @@ import com.njyunzhi.ubpa.service.ITaResumeWorkFormService;
 import com.njyunzhi.ubpa.entity.TaResumeWorkForm;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.net.URL;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -72,6 +76,34 @@ public class TaResumeWorkFormController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @return
+     */
+    @RequestMapping(value="/admin/resume-work-form/export",method= RequestMethod.GET)
+    @ApiOperation(value="申请导出", notes = "申请导出", httpMethod = "GET", response = ResponseBean.class)
+    public void formExport(@ApiParam("企业ID") @RequestParam(value ="orgId", required = false) String orgId,
+                           @ApiParam("申请人") @RequestParam(value ="userName", required = false) String userName,
+                           @ApiParam(value = "起始时间", example = "2022-03-01") @RequestParam(value ="start", required = false) String start,
+                           @ApiParam(value = "结束时间", example = "2022-03-31") @RequestParam(value ="end", required = false) String end,
+                           HttpServletResponse response) throws Exception{
+
+        LocalDateTime startDate = DateUtils.getDayStart(start);
+        LocalDateTime endDate = DateUtils.getDayEnd(end);
+
+        List<FormExport> list = iTaResumeWorkFormService.formExport(orgId, userName, startDate, endDate, Constants.STATUS_NORMAL);
+        for(FormExport item: list) {
+            if (!StringUtils.isEmpty(item.getAntigenImage())) {
+                item.setAntigenImageURL(new URL(item.getAntigenImage()));
+            }
+            if (!StringUtils.isEmpty(item.getNucleicImage())) {
+                item.setNucleicImageURL(new URL(item.getNucleicImage()));
+            }
+        }
+
+        ExcelUtils.flush(response, FormExport.class, list, "测试");
+    }
+
     /**
      * 保存对象
      * @param taResumeWorkForm 实体对象

src/main/java/com/njyunzhi/ubpa/mapper/TaResumeWorkFormMapper.java

@@ -2,7 +2,12 @@ package com.njyunzhi.ubpa.mapper;
 
 import com.njyunzhi.ubpa.entity.TaResumeWorkForm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njyunzhi.ubpa.vo.FormExport;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +20,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaResumeWorkFormMapper extends BaseMapper<TaResumeWorkForm> {
 
+    List<FormExport> formExport(@Param("orgId") String orgId,
+                                @Param("userName") String userName,
+                                @Param("startDate") LocalDateTime startDate,
+                                @Param("endDate") LocalDateTime endDate,
+                                @Param("status") int status);
 }

src/main/java/com/njyunzhi/ubpa/service/ITaResumeWorkFormService.java

@@ -2,6 +2,10 @@ package com.njyunzhi.ubpa.service;
 
 import com.njyunzhi.ubpa.entity.TaResumeWorkForm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njyunzhi.ubpa.vo.FormExport;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaResumeWorkFormService extends IService<TaResumeWorkForm> {
 
+    List<FormExport> formExport(String orgId, String userName, LocalDateTime startDate, LocalDateTime endDate, int status);
 }

src/main/java/com/njyunzhi/ubpa/service/impl/TaResumeWorkFormServiceImpl.java

@@ -4,8 +4,12 @@ import com.njyunzhi.ubpa.entity.TaResumeWorkForm;
 import com.njyunzhi.ubpa.mapper.TaResumeWorkFormMapper;
 import com.njyunzhi.ubpa.service.ITaResumeWorkFormService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njyunzhi.ubpa.vo.FormExport;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 复工申请 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaResumeWorkFormServiceImpl extends ServiceImpl<TaResumeWorkFormMapper, TaResumeWorkForm> implements ITaResumeWorkFormService {
 
+    @Override
+    public List<FormExport> formExport(String orgId, String userName, LocalDateTime startDate, LocalDateTime endDate, int status) {
+        return baseMapper.formExport(orgId, userName, startDate, endDate, status);
+    }
 }

src/main/java/com/njyunzhi/ubpa/shiro/ShiroConfig.java

@@ -79,8 +79,8 @@ public class ShiroConfig {
         // 修改多 Realm 的处理逻辑
         ModularRealmAuthenticator realmAuthenticator = (ModularRealmAuthenticator) manager.getAuthenticator();
         // 主要有一个 Realm 成功, 就立即返回
-//        realmAuthenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy());
-        realmAuthenticator.setAuthenticationStrategy(new FirstExceptionStrategy());
+        realmAuthenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy());
+//        realmAuthenticator.setAuthenticationStrategy(new FirstExceptionStrategy());
 
         //  Use your own realm
         List<Realm> realmList = new ArrayList<Realm>() {{

src/main/java/com/njyunzhi/ubpa/vo/FormExport.java

@@ -0,0 +1,62 @@
+package com.njyunzhi.ubpa.vo;
+
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.converters.url.UrlImageConverter;
+import com.njyunzhi.ubpa.common.excelConverter.ResultStatusConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.net.URL;
+import java.time.LocalDateTime;
+
+@Data
+@ContentRowHeight(15)
+@HeadRowHeight(25)
+@ColumnWidth(25)
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="复工申请导出", description="复工申请导出")
+public class FormExport {
+
+    @ExcelProperty(value = "企业名称", index = 1)
+    @ApiModelProperty(value = "所属企业")
+    private String orgName;
+
+    @ExcelProperty(value = "申请人名称", index = 2)
+    @ApiModelProperty(value = "申请人姓名")
+    private String userName;
+
+    @ExcelIgnore
+    private String antigenImage;
+
+    @ExcelProperty(value = "抗原截图", index = 3, converter = UrlImageConverter.class)
+    @ApiModelProperty(value = "抗原截图")
+    private URL antigenImageURL;
+
+    @ExcelProperty(value = "抗原是否正常", index = 4, converter = ResultStatusConverter.class)
+    @ApiModelProperty(value = "抗原是否正常")
+    private Integer antigenIsNormal;
+
+    @ExcelIgnore
+    private String nucleicImage;
+
+    @ExcelProperty(value = "核酸截图", index = 5, converter = UrlImageConverter.class)
+    @ApiModelProperty(value = "核酸截图")
+    private URL nucleicImageURL;
+
+    @ExcelProperty(value = "核酸是否正常", index = 6, converter = ResultStatusConverter.class)
+    @ApiModelProperty(value = "核酸是否正常")
+    private Integer nucleicIsNormal;
+
+    @ExcelProperty(value = "申请时间", index = 7)
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+}

src/main/resources/mapper/TaResumeWorkFormMapper.xml

@@ -2,4 +2,33 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.ubpa.mapper.TaResumeWorkFormMapper">
 
+    <select id="formExport" resultType="com.njyunzhi.ubpa.vo.FormExport">
+        SELECT
+            s.org_name,
+            t.user_name,
+            t.antigen_image,
+            t.antigen_is_normal,
+            t.nucleic_image,
+            t.nucleic_is_normal,
+            t.create_date
+        FROM
+            ta_resume_work_form t
+            INNER JOIN ta_org s ON t.org_id = s.org_id
+        WHERE
+            t.`status` = #{status}
+          <if test="orgId != null and orgId != ''">
+              AND t.org_id = #{orgId}
+          </if>
+          <if test="userName != null and userName != ''">
+              AND t.user_name LIKE CONCAT( '%', #{userName}, '%' )
+          </if>
+          <if test="startDate != null">
+              AND t.startDate &gt;= #{startDate}
+          </if>
+          <if test="endDate != null">
+            AND t.endDate &lt;= #{endDate}
+          </if>
+        ORDER BY
+        s.org_name ASC
+    </select>
 </mapper>