任务 8612 任务 8695

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/SignDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,60 +23,74 @@ import java.util.Date;
 @ApiModel(value="SignDto", description="打卡记录")
 public class SignDto  extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "打卡人照片")
     private String personPhotos;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "当前页")
     private int current;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "每页几条")
     private int size;
 
+    @ExcelProperty(value = "打卡人", index = 1)
     @ApiModelProperty(value = "打卡人名字")
     private String name;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "打卡人id")
     private String userId;
 
+    @ExcelProperty(value = "岗位", index = 2)
     @ApiModelProperty(value = "打卡人岗位")
     private String jobTitle;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "换流站code")
     private String bizOrgCode;
 
+    @ExcelProperty(value = "换流站", index = 0)
     @ApiModelProperty(value = "换流站Name")
     private String bizOrgName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "打卡时间")
     private String date;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "打卡来源")
     private String source;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "打卡图片")
     private String photos;
 
+    @ExcelProperty(value = "备注", index = 5)
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ExcelProperty(value = "打卡时间", index = 4)
     @ApiModelProperty(value = "打卡时间")
     private Date signTime;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "系统标识（数据隔离使用）")
     private String appKey;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "组件机构")
     private String orgCode;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "开始时间")
     private String signTimeBIGGER;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "结束时间")
     private String signTimeLESS;
 
 
+    @ExcelProperty(value = "打卡类型", index = 3)
     @ApiModelProperty(value = "打卡类型")
     private String type;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/ExcelEnums.java

@@ -27,7 +27,8 @@ public  enum ExcelEnums {
         JYZB ("救援装备", "救援装备", "com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto","JYZB"),//("JYZB","救援装备")
         XFZB ("消防装备", "消防装备", "com.yeejoin.amos.boot.module.common.api.dto.EquipmentDetailDownloadTemplateDto","XFZB"),//("XFZB","消防装备")
 	 	WXXFZB("微型消防站值班", "微型消防站值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingExcleDto","WXXFZB"),//("WXXFZB","微型消防站值班")
-	 	JJZB("120急救站值班", "120急救站值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyFirstAidExcleDto","JJZB"),//("JJZB","120急救站值班")
+	 	JJZB("120急救站值班", "120急救站值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyFirstAidExcleDto","JJZB"),
+        QDSJ("签到数据", "签到数据", "com.yeejoin.amos.boot.module.jcs.api.dto.SignDto","QDSJ"),//("QDSJ","签到数据")
 	 	XFAQBG("消防安全报告", "消防安全报告", "com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrSafeReportExcelDto","XFAQBG");//("XFAQBG","微型消防站值班")
         private String fileName;
         private String sheetName;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.SignDto;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -181,6 +182,9 @@ public class ExcelServiceImpl {
 
 	@Autowired
 	private OrgUsrMapper orgUsrMapper;
+
+	@Autowired
+	SignServiceImpl signServiceImpl;
 	
 	public void templateExport(HttpServletResponse response, ExcelDto excelDto) throws ClassNotFoundException {
 		String url = excelDto.getClassUrl();
@@ -312,6 +316,15 @@ public class ExcelServiceImpl {
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;
+		case "QDSJ":
+			List<SignDto> signDtos = signServiceImpl
+					.queryForSignList();
+			signDtos.stream().forEach(e->{
+				e.setType(e.getType().equals("0") ? "上班打卡" :"下班打卡" );
+			});
+			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+					signDtos, SignDto.class, null, false);
+			break;
 		case "KEYSITE":
 			if(!authFalg) {
 				ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,