Skip to content
GitLab
Commit 07259995 authored by AlanGao's avatar AlanGao
Browse files

update

parent 458409b4
Show whitespace changes
Inline Side-by-side
src/main/java/com/jsh/model/vo/asset/ReportModel.java
View file @ 07259995
......@@ -3,20 +3,19 @@ package com.jsh.model.vo.asset;
import java.io.Serializable;
@SuppressWarnings("serial")
public class ReportModel implements Serializable
{
public class ReportModel implements Serializable {
private ReportShowModel showModel = new ReportShowModel();
/**======开始接受页面参数=================**/
/**
* 资产名称ID
*/
private Long assetNameID ;
private Long assetNameID;
/**
* 资产类型ID
*/
private Long assetCategoryID ;
private Long assetCategoryID;
/**
* 位置属性
......@@ -26,12 +25,12 @@ public class ReportModel implements Serializable
/**
* 状态属性
*/
private Short status ;
private Short status;
/**
* 用户ID
*/
private Long usernameID ;
private Long usernameID;
/**
* 资产单价
......@@ -109,213 +108,171 @@ public class ReportModel implements Serializable
*/
private Integer reportType;
public ReportShowModel getShowModel()
{
public ReportShowModel getShowModel() {
return showModel;
}
public void setShowModel(ReportShowModel showModel)
{
public void setShowModel(ReportShowModel showModel) {
this.showModel = showModel;
}
public Long getAssetNameID()
{
public Long getAssetNameID() {
return assetNameID;
}
public void setAssetNameID(Long assetNameID)
{
public void setAssetNameID(Long assetNameID) {
this.assetNameID = assetNameID;
}
public Long getAssetCategoryID()
{
public Long getAssetCategoryID() {
return assetCategoryID;
}
public void setAssetCategoryID(Long assetCategoryID)
{
public void setAssetCategoryID(Long assetCategoryID) {
this.assetCategoryID = assetCategoryID;
}
public String getLocation()
{
public String getLocation() {
return location;
}
public void setLocation(String location)
{
public void setLocation(String location) {
this.location = location;
}
public Short getStatus()
{
public Short getStatus() {
return status;
}
public void setStatus(Short status)
{
public void setStatus(Short status) {
this.status = status;
}
public Long getUsernameID()
{
public Long getUsernameID() {
return usernameID;
}
public void setUsernameID(Long usernameID)
{
public void setUsernameID(Long usernameID) {
this.usernameID = usernameID;
}
public float getPrice()
{
public float getPrice() {
return price;
}
public void setPrice(float price)
{
public void setPrice(float price) {
this.price = price;
}
public String getPurchasedate()
{
public String getPurchasedate() {
return purchasedate;
}
public void setPurchasedate(String purchasedate)
{
public void setPurchasedate(String purchasedate) {
this.purchasedate = purchasedate;
}
public String getPeriodofvalidity()
{
public String getPeriodofvalidity() {
return periodofvalidity;
}
public void setPeriodofvalidity(String periodofvalidity)
{
public void setPeriodofvalidity(String periodofvalidity) {
this.periodofvalidity = periodofvalidity;
}
public String getWarrantydate()
{
public String getWarrantydate() {
return warrantydate;
}
public void setWarrantydate(String warrantydate)
{
public void setWarrantydate(String warrantydate) {
this.warrantydate = warrantydate;
}
public String getAssetnum()
{
public String getAssetnum() {
return assetnum;
}
public void setAssetnum(String assetnum)
{
public void setAssetnum(String assetnum) {
this.assetnum = assetnum;
}
public String getSerialnum()
{
public String getSerialnum() {
return serialnum;
}
public void setSerialnum(String serialnum)
{
public void setSerialnum(String serialnum) {
this.serialnum = serialnum;
}
public String getLabels()
{
public String getLabels() {
return labels;
}
public void setLabels(String labels)
{
public void setLabels(String labels) {
this.labels = labels;
}
public Long getSupplierID()
{
public Long getSupplierID() {
return supplierID;
}
public void setSupplierID(Long supplierID)
{
public void setSupplierID(Long supplierID) {
this.supplierID = supplierID;
}
public String getDescription()
{
public String getDescription() {
return description;
}
public void setDescription(String description)
{
public void setDescription(String description) {
this.description = description;
}
public Long getAssetID()
{
public Long getAssetID() {
return assetID;
}
public void setAssetID(Long assetID)
{
public void setAssetID(Long assetID) {
this.assetID = assetID;
}
public String getAssetIDs()
{
public String getAssetIDs() {
return assetIDs;
}
public void setAssetIDs(String assetIDs)
{
public void setAssetIDs(String assetIDs) {
this.assetIDs = assetIDs;
}
public int getPageSize()
{
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize)
{
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo()
{
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo)
{
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp()
{
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp)
{
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
public Integer getReportType()
{
public Integer getReportType() {
return reportType;
}
public void setReportType(Integer reportType)
{
public void setReportType(Integer reportType) {
this.reportType = reportType;
}
}
src/main/java/com/jsh/model/vo/asset/ReportShowModel.java
View file @ 07259995
......@@ -4,31 +4,26 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@SuppressWarnings({"serial","rawtypes"})
public class ReportShowModel implements Serializable
{
@SuppressWarnings({"serial", "rawtypes"})
public class ReportShowModel implements Serializable {
//保存报表数据
private List reportData = new ArrayList();
//保存提示信息
private String msgTip = "";
public List getReportData()
{
public List getReportData() {
return reportData;
}
public void setReportData(List reportData)
{
public void setReportData(List reportData) {
this.reportData = reportData;
}
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
}
src/main/java/com/jsh/model/vo/basic/AccountModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class AccountModel implements Serializable
{
public class AccountModel implements Serializable {
private AccountShowModel showModel = new AccountShowModel();
/**======开始接受页面参数=================**/
......@@ -63,56 +62,46 @@ public class AccountModel implements Serializable
*/
private String clientIp = "";
public void setShowModel(AccountShowModel showModel)
{
this.showModel = showModel;
}
public AccountShowModel getShowModel()
{
public AccountShowModel getShowModel() {
return showModel;
}
public void setName(String name)
{
this.name = name;
public void setShowModel(AccountShowModel showModel) {
this.showModel = showModel;
}
public String getName()
{
public String getName() {
return name;
}
public void setSerialNo(String serialNo)
{
this.serialNo = serialNo;
public void setName(String name) {
this.name = name;
}
public String getSerialNo()
{
public String getSerialNo() {
return serialNo;
}
public void setInitialAmount(Double initialAmount)
{
this.initialAmount = initialAmount;
public void setSerialNo(String serialNo) {
this.serialNo = serialNo;
}
public Double getInitialAmount()
{
public Double getInitialAmount() {
return initialAmount;
}
public void setCurrentAmount(Double currentAmount)
{
this.currentAmount = currentAmount;
public void setInitialAmount(Double initialAmount) {
this.initialAmount = initialAmount;
}
public Double getCurrentAmount()
{
public Double getCurrentAmount() {
return currentAmount;
}
public void setCurrentAmount(Double currentAmount) {
this.currentAmount = currentAmount;
}
public Boolean getIsDefault() {
return isDefault;
}
......@@ -121,63 +110,51 @@ public class AccountModel implements Serializable
this.isDefault = isDefault;
}
public void setRemark(String remark)
{
this.remark = remark;
}
public String getRemark()
{
public String getRemark() {
return remark;
}
public void setAccountID(Long accountID)
{
this.accountID = accountID;
public void setRemark(String remark) {
this.remark = remark;
}
public Long getAccountID()
{
public Long getAccountID() {
return accountID;
}
public void setAccountIDs(String accountIDs)
{
this.accountIDs = accountIDs;
public void setAccountID(Long accountID) {
this.accountID = accountID;
}
public String getAccountIDs()
{
public String getAccountIDs() {
return accountIDs;
}
public void setPageSize(int pageSize)
{
this.pageSize = pageSize;
public void setAccountIDs(String accountIDs) {
this.accountIDs = accountIDs;
}
public int getPageSize()
{
public int getPageSize() {
return pageSize;
}
public void setPageNo(int pageNo)
{
this.pageNo = pageNo;
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo()
{
public int getPageNo() {
return pageNo;
}
public void setClientIp(String clientIp)
{
this.clientIp = clientIp;
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp()
{
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
}
src/main/java/com/jsh/model/vo/basic/AccountShowModel.java
View file @ 07259995
......@@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map;
@SuppressWarnings("serial")
public class AccountShowModel implements Serializable
{
public class AccountShowModel implements Serializable {
/**
* 提示信息
*/
......@@ -17,15 +16,13 @@ public class AccountShowModel implements Serializable
* 系统数据
*/
@SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>();
private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
......
src/main/java/com/jsh/model/vo/basic/AppModel.java
View file @ 07259995
package com.jsh.model.vo.basic;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.Serializable;
@SuppressWarnings("serial")
public class AppModel implements Serializable
{
public class AppModel implements Serializable {
private AppShowModel showModel = new AppShowModel();
/**======开始接受页面参数=================**/
......
src/main/java/com/jsh/model/vo/basic/AppShowModel.java
View file @ 07259995
......@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class AppShowModel implements Serializable
{
public class AppShowModel implements Serializable {
/**
* 提示信息
*/
private String msgTip = "";
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
}
src/main/java/com/jsh/model/vo/basic/AssetNameModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class AssetNameModel implements Serializable
{
public class AssetNameModel implements Serializable {
private AssetNameShowModel showModel = new AssetNameShowModel();
/**======开始接受页面参数=================**/
/**
......@@ -52,103 +51,83 @@ public class AssetNameModel implements Serializable
*/
private String clientIp = "";
public AssetNameShowModel getShowModel()
{
public AssetNameShowModel getShowModel() {
return showModel;
}
public void setShowModel(AssetNameShowModel showModel)
{
public void setShowModel(AssetNameShowModel showModel) {
this.showModel = showModel;
}
public String getAssetName()
{
public String getAssetName() {
return assetName;
}
public void setAssetName(String assetName)
{
public void setAssetName(String assetName) {
this.assetName = assetName;
}
public String getDescription()
{
public String getDescription() {
return description;
}
public void setDescription(String description)
{
public void setDescription(String description) {
this.description = description;
}
public Long getAssetNameID()
{
public Long getAssetNameID() {
return assetNameID;
}
public void setAssetNameID(Long assetNameID)
{
public void setAssetNameID(Long assetNameID) {
this.assetNameID = assetNameID;
}
public String getAssetNameIDs()
{
public String getAssetNameIDs() {
return assetNameIDs;
}
public void setAssetNameIDs(String assetNameIDs)
{
public void setAssetNameIDs(String assetNameIDs) {
this.assetNameIDs = assetNameIDs;
}
public int getPageSize()
{
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize)
{
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo()
{
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo)
{
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp()
{
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp)
{
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
public Short getConsumable()
{
public Short getConsumable() {
return consumable;
}
public void setConsumable(Short consumable)
{
public void setConsumable(Short consumable) {
this.consumable = consumable;
}
public Long getCategoryID()
{
public Long getCategoryID() {
return categoryID;
}
public void setCategoryID(Long categoryID)
{
public void setCategoryID(Long categoryID) {
this.categoryID = categoryID;
}
}
src/main/java/com/jsh/model/vo/basic/AssetNameShowModel.java
View file @ 07259995
......@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class AssetNameShowModel implements Serializable
{
public class AssetNameShowModel implements Serializable {
/**
* 提示信息
*/
private String msgTip = "";
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
}
src/main/java/com/jsh/model/vo/basic/CategoryModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class CategoryModel implements Serializable
{
public class CategoryModel implements Serializable {
private CategoryShowModel showModel = new CategoryShowModel();
/**======开始接受页面参数=================**/
......@@ -43,83 +42,67 @@ public class CategoryModel implements Serializable
*/
private String clientIp = "";
public CategoryShowModel getShowModel()
{
public CategoryShowModel getShowModel() {
return showModel;
}
public void setShowModel(CategoryShowModel showModel)
{
public void setShowModel(CategoryShowModel showModel) {
this.showModel = showModel;
}
public String getCategoryName()
{
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName)
{
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getDescription()
{
public String getDescription() {
return description;
}
public void setDescription(String description)
{
public void setDescription(String description) {
this.description = description;
}
public Long getCategoryID()
{
public Long getCategoryID() {
return categoryID;
}
public void setCategoryID(Long categoryID)
{
public void setCategoryID(Long categoryID) {
this.categoryID = categoryID;
}
public String getCategoryIDs()
{
public String getCategoryIDs() {
return categoryIDs;
}
public void setCategoryIDs(String categoryIDs)
{
public void setCategoryIDs(String categoryIDs) {
this.categoryIDs = categoryIDs;
}
public int getPageSize()
{
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize)
{
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo()
{
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo)
{
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp()
{
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp)
{
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
}
src/main/java/com/jsh/model/vo/basic/CategoryShowModel.java
View file @ 07259995
......@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class CategoryShowModel implements Serializable
{
public class CategoryShowModel implements Serializable {
/**
* 提示信息
*/
private String msgTip = "";
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
}
src/main/java/com/jsh/model/vo/basic/DepotModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class DepotModel implements Serializable
{
public class DepotModel implements Serializable {
private DepotShowModel showModel = new DepotShowModel();
/**======开始接受页面参数=================**/
......
src/main/java/com/jsh/model/vo/basic/DepotShowModel.java
View file @ 07259995
......@@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map;
@SuppressWarnings("serial")
public class DepotShowModel implements Serializable
{
public class DepotShowModel implements Serializable {
/**
* 提示信息
*/
......@@ -17,15 +16,13 @@ public class DepotShowModel implements Serializable
* 系统数据
*/
@SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>();
private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
......
src/main/java/com/jsh/model/vo/basic/FunctionsModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class FunctionsModel implements Serializable
{
public class FunctionsModel implements Serializable {
private FunctionsShowModel showModel = new FunctionsShowModel();
/**======开始接受页面参数=================**/
......@@ -47,7 +46,7 @@ public class FunctionsModel implements Serializable
/**
* 拥有的功能列表
*/
private String hasFunctions= "";
private String hasFunctions = "";
/**
* 分类ID
*/
......
src/main/java/com/jsh/model/vo/basic/FunctionsShowModel.java
View file @ 07259995
......@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class FunctionsShowModel implements Serializable
{
public class FunctionsShowModel implements Serializable {
/**
* 提示信息
*/
private String msgTip = "";
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
}
src/main/java/com/jsh/model/vo/basic/InOutItemModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class InOutItemModel implements Serializable
{
public class InOutItemModel implements Serializable {
private InOutItemShowModel showModel = new InOutItemShowModel();
/**======开始接受页面参数=================**/
......@@ -48,93 +47,75 @@ public class InOutItemModel implements Serializable
*/
private String clientIp = "";
public void setShowModel(InOutItemShowModel showModel)
{
this.showModel = showModel;
}
public InOutItemShowModel getShowModel()
{
public InOutItemShowModel getShowModel() {
return showModel;
}
public void setName(String name)
{
this.name = name;
public void setShowModel(InOutItemShowModel showModel) {
this.showModel = showModel;
}
public String getName()
{
public String getName() {
return name;
}
public void setType(String type)
{
this.type = type;
public void setName(String name) {
this.name = name;
}
public String getType()
{
public String getType() {
return type;
}
public void setRemark(String remark)
{
this.remark = remark;
public void setType(String type) {
this.type = type;
}
public String getRemark()
{
public String getRemark() {
return remark;
}
public void setInOutItemID(Long inOutItemID)
{
this.inOutItemID = inOutItemID;
public void setRemark(String remark) {
this.remark = remark;
}
public Long getInOutItemID()
{
public Long getInOutItemID() {
return inOutItemID;
}
public void setInOutItemIDs(String inOutItemIDs)
{
this.inOutItemIDs = inOutItemIDs;
public void setInOutItemID(Long inOutItemID) {
this.inOutItemID = inOutItemID;
}
public String getInOutItemIDs()
{
public String getInOutItemIDs() {
return inOutItemIDs;
}
public void setPageSize(int pageSize)
{
this.pageSize = pageSize;
public void setInOutItemIDs(String inOutItemIDs) {
this.inOutItemIDs = inOutItemIDs;
}
public int getPageSize()
{
public int getPageSize() {
return pageSize;
}
public void setPageNo(int pageNo)
{
this.pageNo = pageNo;
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo()
{
public int getPageNo() {
return pageNo;
}
public void setClientIp(String clientIp)
{
this.clientIp = clientIp;
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp()
{
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
}
src/main/java/com/jsh/model/vo/basic/InOutItemShowModel.java
View file @ 07259995
......@@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map;
@SuppressWarnings("serial")
public class InOutItemShowModel implements Serializable
{
public class InOutItemShowModel implements Serializable {
/**
* 提示信息
*/
......@@ -17,15 +16,13 @@ public class InOutItemShowModel implements Serializable
* 系统数据
*/
@SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>();
private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
......
src/main/java/com/jsh/model/vo/basic/LogModel.java
View file @ 07259995
......@@ -3,14 +3,13 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class LogModel implements Serializable
{
public class LogModel implements Serializable {
private LogShowModel showModel = new LogShowModel();
/**======开始接受页面参数=================**/
/**
* 用户ID
*/
private Long usernameID ;
private Long usernameID;
/**
* 操作
......@@ -66,6 +65,7 @@ public class LogModel implements Serializable
* 用户IP，用户记录操作日志
*/
private String clientIp = "";
public LogShowModel getShowModel() {
return showModel;
}
......@@ -74,127 +74,103 @@ public class LogModel implements Serializable
this.showModel = showModel;
}
public Long getLogID()
{
public Long getLogID() {
return logID;
}
public void setLogID(Long logID)
{
public void setLogID(Long logID) {
this.logID = logID;
}
public String getLogIDs()
{
public String getLogIDs() {
return logIDs;
}
public void setLogIDs(String logIDs)
{
public void setLogIDs(String logIDs) {
this.logIDs = logIDs;
}
public int getPageSize()
{
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize)
{
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getPageNo()
{
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo)
{
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public String getClientIp()
{
public String getClientIp() {
return clientIp;
}
public void setClientIp(String clientIp)
{
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
public Long getUsernameID()
{
public Long getUsernameID() {
return usernameID;
}
public void setUsernameID(Long usernameID)
{
public void setUsernameID(Long usernameID) {
this.usernameID = usernameID;
}
public String getOperation()
{
public String getOperation() {
return operation;
}
public void setOperation(String operation)
{
public void setOperation(String operation) {
this.operation = operation;
}
public String getBeginTime()
{
if(null == beginTime || beginTime.length() == 0)
public String getBeginTime() {
if (null == beginTime || beginTime.length() == 0)
return beginTime;
return beginTime + " 00:00:00";
}
public void setBeginTime(String beginTime)
{
public void setBeginTime(String beginTime) {
this.beginTime = beginTime;
}
public String getEndTime()
{
if(null == endTime || endTime.length() ==0)
public String getEndTime() {
if (null == endTime || endTime.length() == 0)
return endTime;
return endTime + " 23:59:59";
}
public void setEndTime(String endTime)
{
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public Short getStatus()
{
public Short getStatus() {
return status;
}
public void setStatus(Short status)
{
public void setStatus(Short status) {
this.status = status;
}
public String getContentdetails()
{
public String getContentdetails() {
return contentdetails;
}
public void setContentdetails(String contentdetails)
{
public void setContentdetails(String contentdetails) {
this.contentdetails = contentdetails;
}
public String getRemark()
{
public String getRemark() {
return remark;
}
public void setRemark(String remark)
{
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/jsh/model/vo/basic/LogShowModel.java
View file @ 07259995
......@@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map;
@SuppressWarnings("serial")
public class LogShowModel implements Serializable
{
public class LogShowModel implements Serializable {
/**
* 提示信息
*/
......@@ -17,27 +16,23 @@ public class LogShowModel implements Serializable
* 系统数据
*/
@SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>();
private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
@SuppressWarnings("rawtypes")
public Map<String, List> getMap()
{
public Map<String, List> getMap() {
return map;
}
@SuppressWarnings("rawtypes")
public void setMap(Map<String, List> map)
{
public void setMap(Map<String, List> map) {
this.map = map;
}
}
src/main/java/com/jsh/model/vo/basic/RoleModel.java
View file @ 07259995
......@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class RoleModel implements Serializable
{
public class RoleModel implements Serializable {
private RoleShowModel showModel = new RoleShowModel();
/**======开始接受页面参数=================**/
......
src/main/java/com/jsh/model/vo/basic/RoleShowModel.java
View file @ 07259995
......@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable;
@SuppressWarnings("serial")
public class RoleShowModel implements Serializable
{
public class RoleShowModel implements Serializable {
/**
* 提示信息
*/
private String msgTip = "";
public String getMsgTip()
{
public String getMsgTip() {
return msgTip;
}
public void setMsgTip(String msgTip)
{
public void setMsgTip(String msgTip) {
this.msgTip = msgTip;
}
}
Supports Markdown
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