From 57f7298c3d870f0992444991cee670dfc1c51f42 Mon Sep 17 00:00:00 2001 From: luqingyang <lqy5492@163.com> Date: 星期三, 01 十一月 2023 14:32:36 +0800 Subject: [PATCH] feat:调整实体类 --- consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java | 52 +++++++++++++------------- consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java | 32 ++++++++-------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java index 55e6a4b..61d1c0a 100644 --- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java +++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java @@ -60,13 +60,13 @@ @JsonIgnore protected boolean isset_dealTime = false; - private String departmentId = null; - @JsonIgnore - protected boolean isset_departmentId = false; - - private Long departmentName = null; + private String departmentName = null; @JsonIgnore protected boolean isset_departmentName = false; + + private Long departmentId = null; + @JsonIgnore + protected boolean isset_departmentId = false; private String uploadFiles = null; @JsonIgnore @@ -251,32 +251,32 @@ return this.dealTime == null; } - public String getDepartmentId() { - return this.departmentId; - } - - public void setDepartmentId(String departmentId) { - this.departmentId = departmentId; - this.isset_departmentId = true; - } - - @JsonIgnore - public boolean isEmptyDepartmentId() { - return this.departmentId == null || this.departmentId.length() == 0; - } - - public Long getDepartmentName() { + public String getDepartmentName() { return this.departmentName; } - public void setDepartmentName(Long departmentName) { + public void setDepartmentName(String departmentName) { this.departmentName = departmentName; this.isset_departmentName = true; } @JsonIgnore public boolean isEmptyDepartmentName() { - return this.departmentName == null; + return this.departmentName == null || this.departmentName.length() == 0; + } + + public Long getDepartmentId() { + return this.departmentId; + } + + public void setDepartmentId(Long departmentId) { + this.departmentId = departmentId; + this.isset_departmentId = true; + } + + @JsonIgnore + public boolean isEmptyDepartmentId() { + return this.departmentId == null; } public String getUploadFiles() { @@ -324,8 +324,8 @@ .append("operatorId=").append(this.operatorId) .append("operatorName=").append(this.operatorName) .append("dealTime=").append(this.dealTime) - .append("departmentId=").append(this.departmentId) .append("departmentName=").append(this.departmentName) + .append("departmentId=").append(this.departmentId) .append("uploadFiles=").append(this.uploadFiles) .append("states=").append(this.states) .toString(); @@ -375,12 +375,12 @@ if (this.isset_dealTime) { l_wh_form_scrapped.setDealTime(this.getDealTime()); } - if (this.isset_departmentId) { - l_wh_form_scrapped.setDepartmentId(this.getDepartmentId()); - } if (this.isset_departmentName) { l_wh_form_scrapped.setDepartmentName(this.getDepartmentName()); } + if (this.isset_departmentId) { + l_wh_form_scrapped.setDepartmentId(this.getDepartmentId()); + } if (this.isset_uploadFiles) { l_wh_form_scrapped.setUploadFiles(this.getUploadFiles()); } diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java index 7e5f08c..fd5aa17 100644 --- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java +++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped_mapper.java @@ -38,8 +38,8 @@ public static final String OperatorId = "operator_id"; public static final String OperatorName = "operator_name"; public static final String DealTime = "deal_time"; - public static final String DepartmentId = "department_id"; public static final String DepartmentName = "department_name"; + public static final String DepartmentId = "department_id"; public static final String UploadFiles = "upload_files"; public static final String States = "states"; @@ -85,11 +85,11 @@ if (lWhFormScrapped.isset_dealTime) { this.setDealTime(lWhFormScrapped.getDealTime()); } - if (lWhFormScrapped.isset_departmentId) { - this.setDepartmentId(lWhFormScrapped.getDepartmentId()); - } if (lWhFormScrapped.isset_departmentName) { this.setDepartmentName(lWhFormScrapped.getDepartmentName()); + } + if (lWhFormScrapped.isset_departmentId) { + this.setDepartmentId(lWhFormScrapped.getDepartmentId()); } if (lWhFormScrapped.isset_uploadFiles) { this.setUploadFiles(lWhFormScrapped.getUploadFiles()); @@ -150,8 +150,8 @@ ib.set(OperatorId, this.getOperatorId(), this.isset_operatorId); ib.set(OperatorName, this.getOperatorName(), this.isset_operatorName); ib.set(DealTime, this.getDealTime(), this.isset_dealTime); - ib.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ib.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName); + ib.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ib.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles); ib.set(States, this.getStates(), this.isset_states); return ib.genMapSql(); @@ -173,8 +173,8 @@ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId); ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); - ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName); + ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles); ub.set(States, this.getStates(), this.isset_states); ub.where(this.getPkName_(), this.getPkValue_()); @@ -197,8 +197,8 @@ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId); ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); - ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName); + ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles); ub.set(States, this.getStates(), this.isset_states); return ub.genMapSql(where, parameters); @@ -220,8 +220,8 @@ ub.set(OperatorId, this.getOperatorId(), this.isset_operatorId); ub.set(OperatorName, this.getOperatorName(), this.isset_operatorName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); - ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ub.set(DepartmentName, this.getDepartmentName(), this.isset_departmentName); + ub.set(DepartmentId, this.getDepartmentId(), this.isset_departmentId); ub.set(UploadFiles, this.getUploadFiles(), this.isset_uploadFiles); ub.set(States, this.getStates(), this.isset_states); return ub.genArraySql(where, parameters); @@ -271,7 +271,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { - return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, upload_files, states from " + this.getTableName_() + " " + where, parameters); + return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_name, department_id, upload_files, states from " + this.getTableName_() + " " + where, parameters); } /** @@ -279,7 +279,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { - return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_id, department_name, upload_files, states from " + this.getTableName_() + " " + where, parameters); + return new SqlAndParameters<>("select id, l_warehouse_flow_id, business_form_code, warehouse_type, warehouse_id, warehouse_name, agency_id, agency_name, operator_id, operator_name, deal_time, department_name, department_id, upload_files, states from " + this.getTableName_() + " " + where, parameters); } /** @@ -380,16 +380,16 @@ l_wh_form_scrapped.setDealTime(rs.getLong(columnIndex)); } } - columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DepartmentId); - if (columnIndex > 0) { - l_wh_form_scrapped.setDepartmentId(rs.getString(columnIndex)); - } columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DepartmentName); if (columnIndex > 0) { + l_wh_form_scrapped.setDepartmentName(rs.getString(columnIndex)); + } + columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.DepartmentId); + if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { - l_wh_form_scrapped.setDepartmentName(null); + l_wh_form_scrapped.setDepartmentId(null); } else { - l_wh_form_scrapped.setDepartmentName(rs.getLong(columnIndex)); + l_wh_form_scrapped.setDepartmentId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhFormScrapped_mapper.UploadFiles); -- Gitblit v1.9.1