Pope/Survey
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
copper 2021-05-17 15:14:52 +08:00
parent 529ff2d723
commit 3f72e65969
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/example/survey/controller/RecordController.java
View File

@ -3,6 +3,7 @@ package com.example.survey.controller;
import com.example.survey.dto.record.*;
import com.example.survey.enumeration.ResultEnum;
import com.example.survey.service.RecordService;
import com.example.survey.util.TokenUtil;
import com.example.survey.vo.ResultVO;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,8 +31,8 @@ public class RecordController {
@RequestParam(value = "templateName", required = false) String templateName,
@RequestParam(value = "templateType", required = false) String templateType,
@RequestParam(value = "uuid", required = false) String uuid,
@RequestParam(value = "submitTimeGt", required = false) long submitTimeGt,
@RequestParam(value = "submitTimeLt", required = false) long submitTimeLt,
@RequestParam(value = "submitTimeGt", required = false, defaultValue = "0") long submitTimeGt,
@RequestParam(value = "submitTimeLt", required = false, defaultValue = "0") long submitTimeLt,
@RequestParam(value = "projectName", required = false) String projectName,
@RequestParam(value = "currentPage", defaultValue = "0") Integer currentPage,
@RequestParam(value = "pageSize", defaultValue = "30") Integer pageSize
@ -70,14 +71,18 @@ public class RecordController {
}
@PostMapping("/record")
public ResultVO submitRecord(@RequestBody SubmitRecordDTO submitRecordDTO) {
public ResultVO submitRecord(@RequestBody SubmitRecordDTO submitRecordDTO,
@RequestHeader("Authorization") String token) {
submitRecordDTO.setUserPhone((String)TokenUtil.get(token + " : USER_PHONE"));
recordService.createRecord(submitRecordDTO);
return new ResultVO(ResultEnum.SUCCESS);
}
@DeleteMapping("/record")
public ResultVO deleteRecord(@RequestBody DeleteRecordDTO deleteRecordDTO){
public ResultVO deleteRecord(@RequestBody DeleteRecordDTO deleteRecordDTO,
@RequestHeader("Authorization") String token){
deleteRecordDTO.setPhone((String)TokenUtil.get(token + " : USER_PHONE"));
recordService.deleteRecord(deleteRecordDTO);
return new ResultVO(ResultEnum.SUCCESS);
}
@ -101,7 +106,4 @@ public class RecordController {
recordService.modifyMetaData(modifyMetaDataDTO);
return new ResultVO(ResultEnum.SUCCESS);
}
}

3
src/main/java/com/example/survey/dao/impl/RecordDaoImpl.java
View File

@ -112,6 +112,9 @@ public class RecordDaoImpl implements RecordDao {
if (state != null) {
criteria.and("state").is(state);
}
else {
criteria.and("state").nin(RecordStateEnum.FILED.getValue());
}
if (uuid != null) {
criteria.and("uuid").is(uuid);
}

5
src/main/java/com/example/survey/service/impl/MetaDataServiceImpl.java
View File

@ -79,7 +79,10 @@ public class MetaDataServiceImpl implements MetaDataService {
}
MetaData metaData = metaDataDao.selectMetaData(modifyMetaDataDTO.getName());
metaData.setForm(modifyMetaDataDTO.getForm());
metaData.setType(modifyMetaDataDTO.getType());
if(modifyMetaDataDTO.getType() != null) {
metaData.setType(modifyMetaDataDTO.getType());
}
// metaData.setFieldToNameList(modifyMetaDataDTO.getFieldToNameList());
// metaData.setConfig(modifyMetaDataDTO.getConfig());
metaDataDao.saveMetaData(metaData);

1
src/main/java/com/example/survey/service/impl/RecordServiceImpl.java
View File

@ -152,6 +152,7 @@ public class RecordServiceImpl implements RecordService {
return operationInfo;
}).collect(Collectors.toList()));
recordVO.setState(record.getState());
recordVO.setSubmitTime(record.getSubmitTime());
return recordVO;
}).collect(Collectors.toList());
}

2
src/main/java/com/example/survey/vo/RecordVO.java
View File

@ -14,7 +14,7 @@ public class RecordVO {
private String idNumber;
private List<String> projectList;
// private List<String> projectList;
private String template;