From 138d5f087e386c657d964e4e4c2b8ac65038e085 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 二月 2021 14:47:06 +0800
Subject: [PATCH] 优化 考勤任务上报
---
service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
index 301a4b4..4979325 100644
--- a/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/machine/impl/SaveMachineRecordBMOImpl.java
@@ -18,13 +18,17 @@
import com.java110.common.bmo.machine.ISaveMachineRecordBMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.file.FileDto;
+import com.java110.dto.machine.MachineDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.common.IMachineRecordInnerServiceSMO;
import com.java110.po.file.FileRelPo;
import com.java110.po.machine.MachineRecordPo;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,10 +55,13 @@
@Autowired
private IMachineRecordInnerServiceSMO machineRecordInnerServiceSMOImpl;
+ @Autowired
+ private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
@Override
public ResponseEntity<String> saveRecord(MachineRecordDto machineRecordDto) {
- machineRecordDto.setMachineRecordId(GenerateCodeFactory.CODE_PREFIX_machineRecordId);
- if (StringUtil.isEmpty(machineRecordDto.getPhoto())) {
+ machineRecordDto.setMachineRecordId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineRecordId));
+ if (!StringUtil.isEmpty(machineRecordDto.getPhoto())) {
FileDto fileDto = new FileDto();
fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
fileDto.setFileName(fileDto.getFileId());
@@ -71,8 +78,19 @@
fileRelPo.setFileRealName(fileName);
fileRelPo.setFileSaveName(fileName);
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+
+ machineRecordDto.setFileId(fileDto.getFileId());
+ machineRecordDto.setFileTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
}
+ MachineDto machineDto = new MachineDto();
+ machineDto.setMachineCode(machineRecordDto.getMachineCode());
+ machineDto.setCommunityId(machineRecordDto.getCommunityId());
+ List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+
+ Assert.listOnlyOne(machineDtos, "璁惧涓嶅瓨鍦�");
+
+ machineRecordDto.setMachineId(machineDtos.get(0).getMachineId());
List<MachineRecordPo> machineRecordPos = new ArrayList<>();
MachineRecordPo machineRecordPo = BeanConvertUtil.covertBean(machineRecordDto, MachineRecordPo.class);
machineRecordPos.add(machineRecordPo);
--
Gitblit v1.8.0