Commit b2ffb083 authored by 王果's avatar 王果

报检申请增加检验结果方式

parent 447b49f5
...@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jyjc.api.entity; ...@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jyjc.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import java.util.Date; import java.util.Date;
/** /**
...@@ -158,6 +158,9 @@ public class JyjcInspectionApplication extends BaseEntity { ...@@ -158,6 +158,9 @@ public class JyjcInspectionApplication extends BaseEntity {
@TableField("workflow_node") @TableField("workflow_node")
private String workflowNode; private String workflowNode;
/**
* 检验结果方式
*/
@TableField("result_type")
private String resultType;
} }
...@@ -161,7 +161,6 @@ public class JyjcInspectionResult extends BaseEntity { ...@@ -161,7 +161,6 @@ public class JyjcInspectionResult extends BaseEntity {
@TableField("application_date") @TableField("application_date")
private Date applicationDate; private Date applicationDate;
/** /**
* 检验结果方式 * 检验结果方式
*/ */
......
...@@ -2,22 +2,21 @@ package com.yeejoin.amos.boot.module.jyjc.api.model; ...@@ -2,22 +2,21 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
*
*
* @author system_generator * @author system_generator
* @date 2023-12-14 * @date 2023-12-14
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="JyjcInspectionApplicationModel", description="") @ApiModel(value = "JyjcInspectionApplicationModel", description = "")
public class JyjcInspectionApplicationModel extends BaseModel { public class JyjcInspectionApplicationModel extends BaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -100,18 +99,20 @@ public class JyjcInspectionApplicationModel extends BaseModel { ...@@ -100,18 +99,20 @@ public class JyjcInspectionApplicationModel extends BaseModel {
@ApiModelProperty(value = "告知书") @ApiModelProperty(value = "告知书")
private List<Map<String,Object>> gzs; private List<Map<String, Object>> gzs;
@ApiModelProperty(value = "产品质量证明书") @ApiModelProperty(value = "产品质量证明书")
private List<Map<String,Object>> cpzl; private List<Map<String, Object>> cpzl;
@ApiModelProperty(value = "施工自行检查报告") @ApiModelProperty(value = "施工自行检查报告")
private List<Map<String,Object>> sgzx ; private List<Map<String, Object>> sgzx;
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存") @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
private List<Map<String,Object>> sght; private List<Map<String, Object>> sght;
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存") @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
private List<Map<String,Object>> sgfa; private List<Map<String, Object>> sgfa;
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存") @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
private List<Map<String,Object>> sgdwxk; private List<Map<String, Object>> sgdwxk;
@ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存") @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
private List<Map<String,Object>> equip; private List<Map<String, Object>> equip;
@ApiModelProperty("检验结果方式")
private String resultType;
} }
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