Skip to content

A
amos-boot-biz
Commit 7269594a authored by kongfm's avatar kongfm
Browse files
Options

接口测试修正

parent 0f0285dd
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 51 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java
View file @ 7269594a
......@@ -5,6 +5,8 @@ import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -30,10 +32,14 @@ public class BaseDto implements Serializable{
protected Date recDate;
@ExcelIgnore
@ApiModelProperty(value = "更新人")
@ApiModelProperty(value = "更新人id")
protected String recUserId;
@ExcelIgnore
@ApiModelProperty(value = "更新人")
protected String recUserName;
@ExcelIgnore
@ApiModelProperty(value = "是否删除")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IDispatchPaperService.java
View file @ 7269594a
......@@ -34,7 +34,7 @@ public interface IDispatchPaperService {
* @param alertId
* @return
*/
DispatchSaveFeedbackDto getDispatchSaveFeedbackDtoByAlertId(Long alertId, AgencyUserModel feedbackUser);
DispatchSaveFeedbackDto getDispatchSaveFeedbackDtoByAlertId(Long alertId);
/**
* 坐席填写救援回访相关信息
......@@ -48,7 +48,7 @@ public interface IDispatchPaperService {
* @param alertId
* @return
*/
DispatchRepairFeedbackDto getDispatchRepairFeedbackDtoByAlertId(Long alertId, AgencyUserModel feedbackUser);
DispatchRepairFeedbackDto getDispatchRepairFeedbackDtoByAlertId(Long alertId);
/**
......@@ -63,7 +63,7 @@ public interface IDispatchPaperService {
* @param alertId
* @return
*/
DispatchConsultFeedbackDto getDispatchConsultFeedbackDtoByAlertId(Long alertId, AgencyUserModel feedbackUser);
DispatchConsultFeedbackDto getDispatchConsultFeedbackDtoByAlertId(Long alertId);
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java
View file @ 7269594a
......@@ -54,10 +54,8 @@ public class DispatchPaperController extends BaseController {
@GetMapping(value = "/feedback/save/{alertId}")
@ApiOperation(httpMethod = "GET", value = "通过警情id 获取 救援回访相关信息", notes = "通过警情id 获取 救援回访相关信息")
public ResponseModel<DispatchSaveFeedbackDto> getSaveFeedback(@PathVariable Long alertId) {
ReginParams reginParams =
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
DispatchSaveFeedbackDto dispatchSaveFeedbackDto = dispatchPaperServiceImpl.getDispatchSaveFeedbackDtoByAlertId(alertId,reginParams.getUserModel());
DispatchSaveFeedbackDto dispatchSaveFeedbackDto = dispatchPaperServiceImpl.getDispatchSaveFeedbackDtoByAlertId(alertId);
return ResponseHelper.buildResponse(dispatchSaveFeedbackDto);
}
......@@ -85,10 +83,8 @@ public class DispatchPaperController extends BaseController {
@GetMapping(value = "/feedback/repair/{alertId}")
@ApiOperation(httpMethod = "GET", value = "通过警情id 获取 维修回访相关信息", notes = "通过警情id 获取 维修回访相关信息")
public ResponseModel<DispatchRepairFeedbackDto> getRepairFeedBack(@PathVariable Long alertId) {
ReginParams reginParams =
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
DispatchRepairFeedbackDto dispatchRepairFeedbackDto = dispatchPaperServiceImpl.getDispatchRepairFeedbackDtoByAlertId(alertId,reginParams.getUserModel());
DispatchRepairFeedbackDto dispatchRepairFeedbackDto = dispatchPaperServiceImpl.getDispatchRepairFeedbackDtoByAlertId(alertId);
return ResponseHelper.buildResponse(dispatchRepairFeedbackDto);
}
......@@ -116,10 +112,7 @@ public class DispatchPaperController extends BaseController {
@GetMapping(value = "/feedback/consult/{alertId}")
@ApiOperation(httpMethod = "GET", value = "通过警情id 获取 投诉回访相关信息", notes = "通过警情id 获取 投诉回访相关信息")
public ResponseModel<DispatchConsultFeedbackDto> getConsultFeedBack(@PathVariable Long alertId) {
ReginParams reginParams =
JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
DispatchConsultFeedbackDto dispatchConsultFeedbackDto = dispatchPaperServiceImpl.getDispatchConsultFeedbackDtoByAlertId(alertId,reginParams.getUserModel());
DispatchConsultFeedbackDto dispatchConsultFeedbackDto = dispatchPaperServiceImpl.getDispatchConsultFeedbackDtoByAlertId(alertId);
return ResponseHelper.buildResponse(dispatchConsultFeedbackDto);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java
View file @ 7269594a
......@@ -77,10 +77,10 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
@Override
public Object selectAlertCalledById(Long id) {
if(redisUtils.hasKey(RedisKey.ALERTCALLED_ID+id)){
/* if(redisUtils.hasKey(RedisKey.ALERTCALLED_ID+id)){
Object obj= redisUtils.get(RedisKey.ALERTCALLED_ID+id);
return obj;
}else{
return JSON.toJavaObject((JSON) obj,AlertCalledFormDto.class);
}else{*/
// 警情基本信息
AlertCalled alertCalled = this.getById(id);
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
......@@ -97,7 +97,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
AlertCalledVo alertCalledVo = AlertBeanDtoVoUtils.convertAlertCalledDtoToVo(alertCalledDto);
QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
elevatorQueryWrapper.eq("rescue_code", Integer.parseInt(alertCalled.getDeviceId()));
elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
Elevator elevator = iElevatorService.getOne(elevatorQueryWrapper);
if(null != elevator) {
......@@ -112,9 +112,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}
AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledVo, formValue);
redisUtils.set(RedisKey.ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
//redisUtils.set(RedisKey.ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
return alertCalledFormVo;
}
//}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
View file @ 7269594a
......@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchRepairFeedbackDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchSaveFeedbackDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
......@@ -65,6 +66,10 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
@Autowired
private DataDictionaryServiceImpl iDataDictionaryService;
@Autowired
private RescueProcessServiceImpl rescueProcessServiceImpl;
/**
* 分页查询
*/
......@@ -123,9 +128,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
DispatchPaper dispatchPaper =selectDispatchPaperByAlertId(alertId);
// 封装dto
DispatchPaperFormDto dispatchPaperFormDto = new DispatchPaperFormDto();
if(dispatchPaper == null) { //如果没有找到paper 返回空Dto
return dispatchPaperFormDto;
}
dispatchPaperFormDto.setDispatchPaper(dispatchPaper);
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code",dispatchPaper.getAlertCode());
queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code", DispatchPaperEnums.getEnum(dispatchPaper.getAlertCode()).getDynamicCode());
// 派遣单动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
dispatchPaperFormDto.setDynamicFormAlert(list);
......@@ -171,17 +180,28 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
alertFormInitDtoList.stream().forEach(initDto -> {
initDto.getFormItemDescr().setAlertCalledId(dispatchPaper.getSequenceNbr());
initDto.getFormItemDescr().setAlertTypeCode(DispatchPaperEnums.getEnum(dispatchPaper.getAlertCode()).getDynamicCode());
initDto.getFormItemDescr().setFieldValue(null);
paperFormValuelist.add(initDto.getFormItemDescr());
});
// 保存动态表单数据
iAlertFormValueService.saveBatch(paperFormValuelist);
dispatchPaperFormDto.setDispatchPaper(dispatchPaper);
dispatchPaperFormDto.setDynamicFormAlert(paperFormValuelist);
if("KRJY".equals(alertCode)) {
RescueProcessDto rescueProcessDto = new RescueProcessDto();
rescueProcessDto.setAlertId(alertId);
rescueProcessDto.setDispatchStatus(true);
rescueProcessDto.setDispatchTime(dispatchPaper.getDispatchTime());
rescueProcessServiceImpl.updateByAlertId(rescueProcessDto,null);
}
return dispatchPaperFormDto;
}
@Override
public DispatchSaveFeedbackDto getDispatchSaveFeedbackDtoByAlertId(Long alertId, AgencyUserModel feedbackUser) {
public DispatchSaveFeedbackDto getDispatchSaveFeedbackDtoByAlertId(Long alertId) {
DispatchSaveFeedbackDto dispatchSaveFeedbackDto = new DispatchSaveFeedbackDto();
dispatchSaveFeedbackDto.setAlertId(alertId);
AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
......@@ -200,12 +220,12 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchSaveFeedbackDto.setFeedbackFinishTime(dispatchPaper.getFeedbackFinishTime());
dispatchSaveFeedbackDto.setRemark(dispatchPaper.getRemark());
if(StringUtils.isBlank(dispatchPaper.getFeedbackUid())) {
dispatchSaveFeedbackDto.setFeedbackUid(feedbackUser.getUserId());
dispatchSaveFeedbackDto.setFeedbackUid(null);
} else {
dispatchSaveFeedbackDto.setFeedbackUid(dispatchPaper.getFeedbackUid());
}
if(StringUtils.isBlank(dispatchPaper.getFeedbackUname())) {
dispatchSaveFeedbackDto.setFeedbackUname(feedbackUser.getUserName());
dispatchSaveFeedbackDto.setFeedbackUname(null);
} else {
dispatchSaveFeedbackDto.setFeedbackUname(dispatchPaper.getFeedbackUname());
}
......@@ -246,7 +266,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
case "save_feedback_user":
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchSaveFeedbackDto.setSaveFeedbackUser(feedbackUser.getUserName());
dispatchSaveFeedbackDto.setSaveFeedbackUser(null);
} else {
dispatchSaveFeedbackDto.setSaveFeedbackUser(value);
}
......@@ -254,7 +274,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
case "save_feedback_uid":
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchSaveFeedbackDto.setSaveFeedbackUid(feedbackUser.getUserId());
dispatchSaveFeedbackDto.setSaveFeedbackUid(null);
} else {
dispatchSaveFeedbackDto.setSaveFeedbackUid(value);
}
......@@ -340,7 +360,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
}
@Override
public DispatchRepairFeedbackDto getDispatchRepairFeedbackDtoByAlertId(Long alertId, AgencyUserModel feedbackUser) {
public DispatchRepairFeedbackDto getDispatchRepairFeedbackDtoByAlertId(Long alertId) {
DispatchRepairFeedbackDto dispatchRepairFeedbackDto = new DispatchRepairFeedbackDto();
dispatchRepairFeedbackDto.setAlertId(alertId);
AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
......@@ -361,13 +381,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchRepairFeedbackDto.setFeedbackFinishTime(dispatchPaper.getFeedbackFinishTime()); //维修完成时间
dispatchRepairFeedbackDto.setRemark(dispatchPaper.getRemark()); // 维修反馈备注
if(StringUtils.isBlank(dispatchPaper.getFeedbackUid())) { //维修反馈人
dispatchRepairFeedbackDto.setFeedbackUid(feedbackUser.getUserId());
dispatchRepairFeedbackDto.setFeedbackUid(null);
} else {
dispatchRepairFeedbackDto.setFeedbackUid(dispatchPaper.getFeedbackUid());
}
if(StringUtils.isBlank(dispatchPaper.getFeedbackUname())) { //维修反馈人
dispatchRepairFeedbackDto.setFeedbackUname(feedbackUser.getUserName());
dispatchRepairFeedbackDto.setFeedbackUname(null);
} else {
dispatchRepairFeedbackDto.setFeedbackUname(dispatchPaper.getFeedbackUname());
}
......@@ -418,7 +438,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
case "fix_feedback_uname":
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchRepairFeedbackDto.setFixFeedbackUname(feedbackUser.getUserName());
dispatchRepairFeedbackDto.setFixFeedbackUname(null);
} else {
dispatchRepairFeedbackDto.setFixFeedbackUname(value);
}
......@@ -426,7 +446,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
case "fix_feedback_uid":
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchRepairFeedbackDto.setFixFeedbackUid(feedbackUser.getUserId());
dispatchRepairFeedbackDto.setFixFeedbackUid(null);
} else {
dispatchRepairFeedbackDto.setFixFeedbackUid(value);
}
......@@ -530,7 +550,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
}
@Override
public DispatchConsultFeedbackDto getDispatchConsultFeedbackDtoByAlertId(Long alertId, AgencyUserModel feedbackUser) {
public DispatchConsultFeedbackDto getDispatchConsultFeedbackDtoByAlertId(Long alertId) {
DispatchConsultFeedbackDto dispatchConsultFeedbackDto = new DispatchConsultFeedbackDto();
dispatchConsultFeedbackDto.setAlertId(alertId);
AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
......@@ -552,13 +572,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
dispatchConsultFeedbackDto.setRemark(dispatchPaper.getRemark()); // 维修反馈备注
dispatchConsultFeedbackDto.setFeedbackFinishTime(dispatchPaper.getFeedbackFinishTime()); //维保完成时间
if(StringUtils.isBlank(dispatchPaper.getFeedbackUid())) { //维修反馈人
dispatchConsultFeedbackDto.setFeedbackUid(feedbackUser.getUserId());
dispatchConsultFeedbackDto.setFeedbackUid(null);
} else {
dispatchConsultFeedbackDto.setFeedbackUid(dispatchPaper.getFeedbackUid());
}
if(StringUtils.isBlank(dispatchPaper.getFeedbackUname())) { //维修反馈人
dispatchConsultFeedbackDto.setFeedbackUname(feedbackUser.getUserName());
dispatchConsultFeedbackDto.setFeedbackUname(null);
} else {
dispatchConsultFeedbackDto.setFeedbackUname(dispatchPaper.getFeedbackUname());
}
......@@ -613,7 +633,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
case "consult_feedback_uname":
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchConsultFeedbackDto.setConsultFeedbackUname(feedbackUser.getUserName());
dispatchConsultFeedbackDto.setConsultFeedbackUname(null);
} else {
dispatchConsultFeedbackDto.setConsultFeedbackUname(value);
}
......@@ -621,7 +641,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
case "consult_feedback_uid":
value = alertFormValue.getFieldValue();
if (StringUtils.isBlank(value)) {
dispatchConsultFeedbackDto.setConsultFeedbackUid(feedbackUser.getUserId());
dispatchConsultFeedbackDto.setConsultFeedbackUid(null);
} else {
dispatchConsultFeedbackDto.setConsultFeedbackUid(value);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java
View file @ 7269594a
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
......@@ -93,7 +94,17 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
// 创建派遣单
dispatchTaskDto.setDispatchTime(new Date());
DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class);
dispatchTask.setPaperId(dispatchPaperDto.getSequenceNbr());
dispatchTask.setPaperId(dispatchPaperDto.getDispatchPaper().getSequenceNbr());
if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals("levelOneUnit") || dispatchTask.getOrgTypeCode().equals("levelTwoUnit"))) {
throw new BadRequest("已经派遣过其他力量调派");
}
if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("useUnit")) {
throw new BadRequest("已经派遣过使用单位");
}
if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("repairUnit") ) {
throw new BadRequest("已经派遣过维修单位调派");
}
flag = this.save(dispatchTask);
if(flag) { // 创建好派遣任务单以后根据任务单类型修改派遣单信息
// 社会信用代码 根据类型查找放入
......@@ -103,6 +114,14 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setUseOrgId(useUnit.getSequenceNbr());
dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr());
if(dispatchPaper.getAlertCode().equals("KRJY")) {
dynamicFormAlert.stream().forEach(alertFormValue -> {
if(alertFormValue.getFieldCode().equals("dispatch_status")) {
alertFormValue.setFieldValue("已派遣");
alertFormValue.setFieldValueCode("hasDispatched");
}
});
}
break;
case "repairUnit":
maintenanceUnit = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId());
......@@ -110,9 +129,6 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
break;
case "levelOneUnit":
if(dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派
throw new BadRequest("已经派遣过其他力量调派");
} else {
maintenanceUnit = iMaintenanceUnitService.getById(dispatchTask.getResponseOrgId());
String socialCreditCode = maintenanceUnit.getSocialCreditCode();
dispatchPaper.setRepairOrgId(maintenanceUnit.getSequenceNbr());
......@@ -129,13 +145,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
alertFormValue.setFieldValue(socialCreditCode);
}
});
}
break;
case "levelTwoUnit":
if(dispatchPaper.getRepairOrgId() != null) { // 已经派遣过调派
throw new BadRequest("已经派遣过其他力量调派");
} else {
RescueStation rescueStation = iRescueStationService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setRepairOrgId(rescueStation.getSequenceNbr());
dispatchPaper.setRepairOrgTaskId(dispatchTask.getSequenceNbr());
......@@ -149,13 +160,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
alertFormValue.setFieldValueCode("levelTwoUnit");
}
});
}
break;
}
// 保存派遣单
dispatchPaperServiceImpl.save(dispatchPaper);
dispatchPaperServiceImpl.updateById(dispatchPaper);
// 保存动态表单数据
iAlertFormValueService.saveBatch(dynamicFormAlert);
iAlertFormValueService.updateBatchById(dynamicFormAlert);
}
return flag;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueProcessServiceImpl.java
View file @ 7269594a
......@@ -88,7 +88,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
QueryWrapper<RescueProcess> templateQueryWrapper = new QueryWrapper<>();
templateQueryWrapper.eq("alert_id", rescueProcessDto.getAlertId());
RescueProcess rescueProcess = this.getOne(templateQueryWrapper);
if (rescueProcess != null)
if (rescueProcess == null)
throw new BadRequest("救援过程信息未找到");
if (rescueProcessDto.getDispatchByUser()) { // 手动更新了派遣信息为三级派遣
// 判断是否存在派遣单 不存在先创建派遣单
......@@ -136,6 +136,10 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
iAlertFormValueService.saveBatch(dynamicFormAlert);
}
}
rescueProcessDto.setSequenceNbr(rescueProcess.getSequenceNbr());
rescueProcessDto.setRecDate(rescueProcess.getRecDate());
rescueProcessDto.setRecUserId(rescueProcess.getRecUserId());
rescueProcessDto.setRecUserName(rescueProcess.getRecUserName());
rescueProcess = BeanDtoVoUtils.convert(rescueProcessDto, RescueProcess.class);
return this.updateById(rescueProcess);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment