打卡优化

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/SignController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +16,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.SignServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -36,6 +43,8 @@ public class SignController extends BaseController {
     @Autowired
     SignServiceImpl signServiceImpl;
 
+	@Autowired
+	OrgUsrServiceImpl iOrgUsrService;
     /**
      * 新增打卡记录
      *
@@ -79,6 +88,7 @@ public class SignController extends BaseController {
     /**
      * 根据sequenceNbr查询
      *
+     *
 	 * @param sequenceNbr  主键
      * @return
      */
@@ -86,7 +96,21 @@ public class SignController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个打卡记录",  notes = "根据sequenceNbr查询单个打卡记录")
 	public ResponseModel<SignDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(signServiceImpl.queryBySeq(sequenceNbr));
+		SignDto signDto = signServiceImpl.queryBySeq(sequenceNbr);
+		QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("amos_user_id",signDto.getSignUserId());
+		queryWrapper.eq("is_delete",0);
+		OrgUsr orgUsr = iOrgUsrService.getOne(queryWrapper);
+		try {
+			OrgPersonFormDto orgPersonFormDto = iOrgUsrService.selectPersonById(orgUsr.getSequenceNbr());
+			List<FormValue> personImg = orgPersonFormDto.getDynamicFormAlert().stream().filter(e -> e.getKey().equals("personImg")).collect(Collectors.toList());
+			signDto.setPersonPhotos(personImg.get(0).getValue());
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			return ResponseHelper.buildResponse(signDto);
+		}
+
 	}
 
 	/**

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

@@ -10,10 +10,13 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -317,13 +320,34 @@ public class ExcelServiceImpl {
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;
 		case "QDSJ":
-			List<SignDto> signDtos = signServiceImpl
-					.queryForSignList();
-			signDtos.stream().forEach(e->{
+			SignDto dto = new SignDto();
+			if(par!=null && par.size()>0) {
+				String date =par.containsKey("date")?par.get("date").toString():null;
+				String bizOrgCode =par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null;
+				String bizOrgName =par.containsKey("bizOrgName")?par.get("bizOrgName").toString():null;
+				String name =par.containsKey("name")?par.get("name").toString():null;
+				String type =par.containsKey("type")?par.get("type").toString():null;
+				String signTimeBIGGER =par.containsKey("signTimeBIGGER")?par.get("signTimeBIGGER").toString():null;
+				String signTimeLESS =par.containsKey("signTimeLESS")?par.get("signTimeLESS").toString():null;
+				dto.setBizOrgCode(bizOrgCode);
+				dto.setDate(date);
+				dto.setBizOrgName(bizOrgName);
+				dto.setName(name);
+				dto.setSignTimeBIGGER(signTimeBIGGER);
+				dto.setSignTimeLESS(signTimeLESS);
+				dto.setType(type);
+			}
+
+			Page<SignDto> page = new Page<>();
+			page.setCurrent(1);
+			page.setSize(10000);
+			IPage<SignDto> signDtos = signServiceImpl
+					.queryForSignPageByMapper(page,dto);
+			signDtos.getRecords().stream().forEach(e->{
 				e.setType(e.getType().equals("0") ? "上班打卡" :"下班打卡" );
 			});
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-					signDtos, SignDto.class, null, false);
+					signDtos.getRecords(), SignDto.class, null, false);
 			break;
 		case "KEYSITE":
 			if(!authFalg) {