From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/entity/OpeApply.java | 408 +++++----------------------------------------------------
1 files changed, 39 insertions(+), 369 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
index 8365d57..4555830 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApply.java
@@ -1,8 +1,11 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.util.Validator;
+import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -12,373 +15,65 @@
/**
* Created by johnny on 17/11/23.
*/
+@Setter
+@Getter
+@JsonIgnoreProperties(value = {"handler"})
public class OpeApply implements Serializable,Comparable<OpeApply> {
-
- private String first;
- private String second;
-
- public String getFirst() {
- return first;
- }
-
- public void setFirst(String first) {
- this.first = first;
- }
-
- public String getSecond() {
- return second;
- }
-
- public void setSecond(String second) {
- this.second = second;
- }
-
- private String firName;
- private String firstUser;
-
- public String getFirName() {
- return firName;
- }
-
- public void setFirName(String firName) {
- this.firName = firName;
- }
-
- public String getFirstUser() {
- return firstUser;
- }
-
- public void setFirstUser(String firstUser) {
- this.firstUser = firstUser;
- }
-
- private String id;
+ private Long id;
private String applyCode;
+ private Long reagentId;
+ private Integer used;
private Integer num;
private Timestamp deadline;
- private String applyUserId;
- private String objective;
+ private Long applyUserId;
+ private Long projectId;
private ApplyStatus status;
private Timestamp createTime;
private Timestamp updateTime;
private ValidFlag validFlag;
- private String approveUserId;
- private String beforeApproveUserId;
+ private Long approveUserId;
private String memo;
- private SysReagent reagent;
+ private Long beforeApproveUserId;
+ private String before_memo;
+ private String startReagentCode;
+ private String endReagentCode;
+ private Integer arrivalNum;
+ private Long houseId;
+ private String place;
+ private Long containerId;
+ private String articleNumber;
+ private String applyGoal;
+ private BigDecimal applyPrice;
+ private Integer stockFlag;
+ private Long firstUser;
+ private Long consigneeId;
+ private Timestamp arrivalTime;
+
+
+ //非数据库字段
+ private String firName;
+ private SysReagent reagent;
+ private OpeOrder order;
private String applyUserName;
private String applyUserProject;
private String applyUserDepartment;
-
private String approveUserName;
-
private String secondUserName;
-
private ApplyStatus orderStatus;
-
- public String getSecondUserName() {
- return secondUserName;
- }
-
- public void setSecondUserName(String secondUserName) {
- this.secondUserName = secondUserName;
- }
-
// 用于订单入库的时候表格编辑字段
- private Integer arrivalNum;
- private String articleNumber;
- private String startReagentCode;
- private String endReagentCode;
+
private List<String> reagentCodeList;
- private String houseId;
- private String containerId;
- private String placeId;
-
private String projectName;
- private String projectId;
private String projectOwner;
- private String ownerDepartment;
-
- private String applyGoal;
- private BigDecimal applyPrice;
- private int stockFlag;
+ private Long ownerDepartment;
private String stockFlagValue;
//用于存放仓库 和仓库货柜的id
- private String warehouseId;
- private String warehouseContainerId;
+ private Long warehouseId;
+ private Long warehouseContainerId;
- public String getStockFlagValue() {
- return stockFlagValue;
- }
-
- public void setStockFlagValue(String stockFlagValue) {
- this.stockFlagValue = stockFlagValue;
- }
-
- public int getStockFlag() {
- return stockFlag;
- }
-
- public void setStockFlag(int stockFlag) {
- this.stockFlag = stockFlag;
- }
-
- public BigDecimal getApplyPrice() {
- return applyPrice;
- }
-
- public void setApplyPrice(BigDecimal applyPrice) {
- this.applyPrice = applyPrice;
- }
-
- public String getApplyGoal() {
- return applyGoal;
- }
-
- public void setApplyGoal(String applyGoal) {
- this.applyGoal = Validator.filter(applyGoal);
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getApplyCode() {
- return applyCode;
- }
-
- public void setApplyCode(String applyCode) {
- this.applyCode = applyCode;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = Integer.parseInt(Validator.filter(num.toString()));
- }
-
- public String getApplyUserId() {
- return applyUserId;
- }
-
- public void setApplyUserId(String applyUserId) {
- this.applyUserId = applyUserId;
- }
-
- public String getObjective() {
- return objective;
- }
-
- public void setObjective(String objective) {
- this.objective = Validator.filter(objective);
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public String getApproveUserId() {
- return approveUserId;
- }
- public String getBeforeApproveUserId(){
- return beforeApproveUserId;
- }
-
- public void setBeforeApproveUserId(String beforeApproveUserId){
- this.beforeApproveUserId=beforeApproveUserId;
- }
- public void setApproveUserId(String approveUserId) {
- this.approveUserId = Validator.filter(approveUserId);
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Timestamp getDeadline() {
- return deadline;
- }
-
- public void setDeadline(Timestamp deadline) {
- this.deadline = deadline;
- }
-
- public ApplyStatus getStatus() {
- return status;
- }
-
- public void setStatus(ApplyStatus status) {
- this.status = status;
- }
-
- public SysReagent getReagent() {
- return reagent;
- }
-
- public void setReagent(SysReagent reagent) {
- this.reagent = reagent;
- }
-
- public String getApplyUserName() {
- return applyUserName;
- }
-
- public void setApplyUserName(String applyUserName) {
- this.applyUserName = applyUserName;
- }
-
- public Integer getArrivalNum() {
- return arrivalNum;
- }
-
- public void setArrivalNum(Integer arrivalNum) {
- this.arrivalNum = arrivalNum;
- }
-
- public String getArticleNumber() {
- return articleNumber;
- }
-
- public void setArticleNumber(String articleNumber) {
- this.articleNumber = articleNumber;
- }
-
- public String getStartReagentCode() {
- return startReagentCode;
- }
-
- public void setStartReagentCode(String startReagentCode) {
- this.startReagentCode = startReagentCode;
- }
-
- public String getEndReagentCode() {
- return endReagentCode;
- }
-
- public void setEndReagentCode(String endReagentCode) {
- this.endReagentCode = endReagentCode;
- }
-
- public String getHouseId() {
- return houseId;
- }
-
- public void setHouseId(String houseId) {
- this.houseId = houseId;
- }
-
- public String getContainerId() {
- return containerId;
- }
-
- public void setContainerId(String containerId) {
- this.containerId = containerId;
- }
-
- public String getPlaceId() {
- return placeId;
- }
-
- public void setPlaceId(String placeId) {
- this.placeId = placeId;
- }
-
- public String getApproveUserName() {
- return approveUserName;
- }
-
- public void setApproveUserName(String approveUserName) {
- this.approveUserName = approveUserName;
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public String getProjectId() {
- return projectId;
- }
-
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
-
- public List<String> getReagentCodeList() {
- return reagentCodeList;
- }
-
- public void setReagentCodeList(List<String> reagentCodeList) {
- this.reagentCodeList = reagentCodeList;
- }
-
- public String getProjectOwner() {
- return projectOwner;
- }
-
- public void setProjectOwner(String projectOwner) {
- this.projectOwner = projectOwner;
- }
-
-
-
- public String getOwnerDepartment() {
- return ownerDepartment;
- }
-
- public void setOwnerDepartment(String ownerDepartment) {
- this.ownerDepartment = ownerDepartment;
- }
-
- public String getWarehouseId() {
- return warehouseId;
- }
-
- public void setWarehouseId(String warehouseId) {
- this.warehouseId = warehouseId;
- }
-
- public String getWarehouseContainerId() {
- return warehouseContainerId;
- }
-
- public void setWarehouseContainerId(String warehouseContainerId) {
- this.warehouseContainerId = warehouseContainerId;
- }
+ private String first;
+ private String second;
@Override
public int compareTo(OpeApply o) {
@@ -405,30 +100,5 @@
sb.append(", secondUserName='").append(secondUserName).append('\'');
sb.append('}');
return sb.toString();
- }
-
-
- public ApplyStatus getOrderStatus() {
- return orderStatus;
- }
-
- public void setOrderStatus(ApplyStatus orderStatus) {
- this.orderStatus = orderStatus;
- }
-
- public String getApplyUserProject() {
- return applyUserProject;
- }
-
- public void setApplyUserProject(String applyUserProject) {
- this.applyUserProject = applyUserProject;
- }
-
- public String getApplyUserDepartment() {
- return applyUserDepartment;
- }
-
- public void setApplyUserDepartment(String applyUserDepartment) {
- this.applyUserDepartment = applyUserDepartment;
}
}
--
Gitblit v1.9.2