sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-05-19 09:59:17 +08:00
parent 342bed13f1
commit b3e68ed85b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
View File

@ -484,6 +484,7 @@ public class LabourApiController extends BaseController {
SurProjectAttendanceData surProjectAttendanceData = JSONObject.parseObject(req.getData(), SurProjectAttendanceData.class);
//30秒内未重复请求
if(Convert.toBool(redisCache.getCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId()),true)){
redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
//判断base64图片
if(StringUtils.isNotEmpty(surProjectAttendanceData.getScanPhotoBase64())){
String filePath = FileUploadUtils.uploadImages(RuoYiConfig.getUploadPath(), MultipartFileUtils.base64ToMultipartFile(surProjectAttendanceData.getScanPhotoBase64()));
@ -544,7 +545,7 @@ public class LabourApiController extends BaseController {
//进出门逻辑判断
//if(Objects.equals("L",surProjectAttendanceData.getAttendanceType())){
//surProjectAttendanceData.setAttendanceOutTime(labourDataVo.getAttendanceTime());
surProjectAttendanceData.setAttendanceTime(labourDataVo.getAttendanceTime());
surProjectAttendanceData.setAttendanceTime(labourDataVo.getAttendanceTime());
//}
surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
@ -573,7 +574,6 @@ public class LabourApiController extends BaseController {
list.add(surProjectAttendanceData);
surProjectAttendanceDataService.batchSurProjectAttendanceData(list);
}
redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
}else{
String messages = validateSet.stream()
.map(ConstraintViolation::getMessage)
@ -643,6 +643,7 @@ public class LabourApiController extends BaseController {
for(SurProjectAttendanceData surProjectAttendanceData:surProjectAttendanceDataList){
//30秒内未重复请求
if(Convert.toBool(redisCache.getCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId()),true)){
redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
//判断base64图片
if(StringUtils.isNotEmpty(surProjectAttendanceData.getScanPhotoBase64())){
String filePath = FileUploadUtils.uploadImages(RuoYiConfig.getUploadPath(), MultipartFileUtils.base64ToMultipartFile(surProjectAttendanceData.getScanPhotoBase64()));
@ -722,7 +723,6 @@ public class LabourApiController extends BaseController {
surProjectAttendanceData.setCreateTime(new Date());
saveList.add(surProjectAttendanceData);
}
redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
}
}
if(StringUtils.isNotEmpty(saveList)){

2
ruoyi-ui/src/views/statistics/statisticsProject/index.vue
View File

@ -441,7 +441,7 @@ export default {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// column.property是表头的key
let _row = 1;
if ([0, 4, 6, 7, 11, 12, 13, 14, 19, 20, 21, 22, 26].includes(columnIndex)) {
if ([0, 4, 6, 7, 11, 12, 13, 14, 19, 20, 21, 22].includes(columnIndex)) {
var spanArr = this.getSpanArr(column.property);
_row = spanArr[rowIndex];
}

1
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java
View File

@ -654,7 +654,6 @@ public class ProjectViewController extends BaseBuildNodeController{
sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 20, 20));//单元格合并
sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 21, 21));//单元格合并
sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 22, 22));//单元格合并
sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 26, 26));//单元格合并
}
trindex=0;
}else{