Commit ff2b3774 authored by 竹天卫's avatar 竹天卫

实验室入驻详情:

申请类型根据status判断 status=0:入驻申请 status=2:延期申请 status=3:验收申请
parent 3136ad3e
......@@ -64,7 +64,8 @@ public class SettleController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "实验室入驻详情")
@ApiOperation(value = "实验室入驻详情",
notes = "申请类型根据status判断 status=0:入驻申请 status=2:延期申请 status=3:验收申请")
@GetMapping("/getDetail/{settleId}")
public BaseResponse getDetail(@PathVariable Integer settleId) {
try {
......
package cn.wise.sc.cement.business.model.vo;
import cn.wise.sc.cement.business.entity.SettleRecord;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* @description:
......@@ -105,33 +100,22 @@ public class SettleVo {
@ApiModelProperty("申请类型(实验室入驻申请、实验室延期申请、实验室验收申请)")
private String applyType;
//审批对应的结果信息
@ApiModelProperty("入驻申请说明")
private String settleOpinion;
@ApiModelProperty("入驻申请结果 通过/驳回")
private String settleResult;
@ApiModelProperty("延期说明")
private String delayOpinion;
@ApiModelProperty("延期结果 通过/驳回")
private String delayResult;
/**
* 验收结果
*/
@ApiModelProperty("验收说明")
private String checkOpinion;
/**
* 审批结果(0申请,1通过,2驳回)
*/
@ApiModelProperty("验收结果 正常/异常")
private String checkResult;
......
......@@ -123,6 +123,12 @@ public class SettleServiceImpl extends ServiceImpl<SettleMapper, Settle> impleme
}
SettleVo settleVo = new SettleVo();
BeanUtils.copyProperties(settle, settleVo);
//申请类型 根据状态 status 字段判断
// status = 0 入驻申请
// status = 2 延期申请
// status = 3 验收申请
//所选择的设备信息
QueryWrapper<SettleEquipment> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("settle_id", settleVo.getId());
List<SettleEquipment> seList = settleEquipmentService.list(queryWrapper);
......
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