update

src/main/java/com/jsh/dao/materials/AccountHeadDAO.java

 package com.jsh.dao.materials;
 
-import org.hibernate.Query;
-
 import com.jsh.base.BaseDAO;
-import com.jsh.util.JshException;
 import com.jsh.model.po.AccountHead;
-import com.jsh.model.po.DepotHead;
-import com.jsh.model.po.UserBusiness;
+import com.jsh.util.JshException;
 import com.jsh.util.PageUtil;
 import com.jsh.util.SearchConditionUtil;
+import org.hibernate.Query;
 
 /**
  * @author alan
  */
-public class AccountHeadDAO extends BaseDAO<AccountHead> implements AccountHeadIDAO
-{
+public class AccountHeadDAO extends BaseDAO<AccountHead> implements AccountHeadIDAO {
     /**
      * 设置dao映射基类
+     *
      * @return
      */
     @Override
-    public Class<AccountHead> getEntityClass()
-    {
+    public Class<AccountHead> getEntityClass() {
         return AccountHead.class;
     }
-    
+
     @SuppressWarnings("unchecked")
     @Override
-    public void find(PageUtil<AccountHead> pageUtil,String maxid) throws JshException
-    {
+    public void find(PageUtil<AccountHead> pageUtil, String maxid) throws JshException {
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from AccountHead accountHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setTotalCount(query.list().size());
         pageUtil.setPageList(query.list());
     }
-    
+
     @SuppressWarnings("unchecked")
     @Override
-    public void findAllMoney(PageUtil<AccountHead> pageUtil, Integer supplierId, String type, String mode) throws JshException
-    {
+    public void findAllMoney(PageUtil<AccountHead> pageUtil, Integer supplierId, String type, String mode) throws JshException {
         Query query;
         String modeName = "";
-        if(mode.equals("实际")){
-        	modeName = "ChangeAmount";
-        }
-        else if(mode.equals("合计")){
-        	modeName = "TotalPrice";
+        if (mode.equals("实际")) {
+            modeName = "ChangeAmount";
+        } else if (mode.equals("合计")) {
+            modeName = "TotalPrice";
         }
-        query= this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from AccountHead accountHead where Type='" + type + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
+        query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from AccountHead accountHead where Type='" + type + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setTotalCount(query.list().size());
         pageUtil.setPageList(query.list());
     }

src/main/java/com/jsh/dao/materials/AccountHeadIDAO.java

 package com.jsh.dao.materials;
 
 import com.jsh.base.BaseIDAO;
-import com.jsh.util.JshException;
 import com.jsh.model.po.AccountHead;
-import com.jsh.model.po.DepotHead;
-import com.jsh.model.po.UserBusiness;
+import com.jsh.util.JshException;
 import com.jsh.util.PageUtil;
 
-public interface AccountHeadIDAO extends BaseIDAO<AccountHead>
-{
+public interface AccountHeadIDAO extends BaseIDAO<AccountHead> {
     /*
      * 获取MaxId
      */
-    void find(PageUtil<AccountHead> pageUtil,String maxid) throws JshException;
-    
+    void find(PageUtil<AccountHead> pageUtil, String maxid) throws JshException;
+
     void findAllMoney(PageUtil<AccountHead> pageUtil, Integer supplierId, String type, String mode) throws JshException;
 }

src/main/java/com/jsh/dao/materials/AccountItemDAO.java

 package com.jsh.dao.materials;
 
-import org.hibernate.Query;
-
 import com.jsh.base.BaseDAO;
-import com.jsh.util.JshException;
 import com.jsh.model.po.AccountItem;
-import com.jsh.util.PageUtil;
-import com.jsh.util.SearchConditionUtil;
 
-public class AccountItemDAO extends BaseDAO<AccountItem> implements AccountItemIDAO
-{
+public class AccountItemDAO extends BaseDAO<AccountItem> implements AccountItemIDAO {
     /**
      * 设置dao映射基类
+     *
      * @return
      */
     @Override
-    public Class<AccountItem> getEntityClass()
-    {
+    public Class<AccountItem> getEntityClass() {
         return AccountItem.class;
     }
 }

src/main/java/com/jsh/dao/materials/AccountItemIDAO.java

 package com.jsh.dao.materials;
 
 import com.jsh.base.BaseIDAO;
-import com.jsh.util.JshException;
 import com.jsh.model.po.AccountItem;
-import com.jsh.util.PageUtil;
 
-public interface AccountItemIDAO extends BaseIDAO<AccountItem>
-{
-    
+public interface AccountItemIDAO extends BaseIDAO<AccountItem> {
+
 }
 

src/main/java/com/jsh/dao/materials/DepotHeadDAO.java

 package com.jsh.dao.materials;
 
-import org.hibernate.Query;
-
 import com.jsh.base.BaseDAO;
-import com.jsh.util.JshException;
 import com.jsh.model.po.DepotHead;
+import com.jsh.util.JshException;
 import com.jsh.util.PageUtil;
 import com.jsh.util.SearchConditionUtil;
+import org.hibernate.Query;
 
 public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
-	/**
+    /**
      * 设置dao映射基类
+     *
      * @return
      */
-	@Override
-    public Class<DepotHead> getEntityClass()
-    {
+    @Override
+    public Class<DepotHead> getEntityClass() {
         return DepotHead.class;
     }
-	
+
     @SuppressWarnings("unchecked")
     @Override
-    public void find(PageUtil<DepotHead> pageUtil,String maxid) throws JshException
-    {
+    public void find(PageUtil<DepotHead> pageUtil, String maxid) throws JshException {
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from DepotHead depotHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setTotalCount(query.list().size());
         pageUtil.setPageList(query.list());
     }
-    
+
     @SuppressWarnings("unchecked")
     @Override
-    public void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException
-    {
+    public void findAllMoney(PageUtil<DepotHead> pageUtil, Integer supplierId, String type, String subType, String mode) throws JshException {
         Query query;
         String modeName = "";
-        if(mode.equals("实际")){
-        	modeName = "ChangeAmount";
-        }
-        else if(mode.equals("合计")){
-        	modeName = "DiscountLastMoney";
+        if (mode.equals("实际")) {
+            modeName = "ChangeAmount";
+        } else if (mode.equals("合计")) {
+            modeName = "DiscountLastMoney";
         }
-        query= this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from DepotHead depotHead where Type='" + type + "' and SubType = '" + subType + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
+        query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select sum(" + modeName + ") as allMoney from DepotHead depotHead where Type='" + type + "' and SubType = '" + subType + "' and OrganId =" + supplierId + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setTotalCount(query.list().size());
         pageUtil.setPageList(query.list());
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public void batchSetStatus(Boolean status,String depotHeadIDs) {
-        String sql="update jsh_depothead d set d.Status=" + status + " where d.id in (" + depotHeadIDs + ")";
+    public void batchSetStatus(Boolean status, String depotHeadIDs) {
+        String sql = "update jsh_depothead d set d.Status=" + status + " where d.id in (" + depotHeadIDs + ")";
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(sql);
         query.executeUpdate();
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public void findInDetail(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException {
+    public void findInDetail(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException {
         StringBuffer queryString = new StringBuffer();
         queryString.append("select dh.Number,m.`name`,m.Model,di.UnitPrice,di.OperNumber,di.AllPrice,s.supplier,d.dName," +
                 "date_format(dh.OperTime, '%Y-%m-%d'), concat(dh.SubType,dh.Type) as newType " +
@@ -63,18 +59,17 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
                 "inner join jsh_material m on m.id=di.MaterialId " +
                 "inner join jsh_supplier s on s.id=dh.OrganId " +
                 "inner join (select id,name as dName from jsh_depot) d on d.id=di.DepotId " +
-                "where dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"' ");
-        if(oId!=null){
-            queryString.append(" and dh.OrganId = "+ oId );
-        }
-        if(pid!=null){
-            queryString.append(" and di.DepotId=" + pid );
+                "where dh.OperTime >='" + beginTime + "' and dh.OperTime <='" + endTime + "' ");
+        if (oId != null) {
+            queryString.append(" and dh.OrganId = " + oId);
         }
-        else {
-            queryString.append(" and di.DepotId in (" + dids + ")" );
+        if (pid != null) {
+            queryString.append(" and di.DepotId=" + pid);
+        } else {
+            queryString.append(" and di.DepotId in (" + dids + ")");
         }
-        if(type!=null && !type.equals("")) {
-            queryString.append(" and dh.Type='"+ type +"'");
+        if (type != null && !type.equals("")) {
+            queryString.append(" and dh.Type='" + type + "'");
         }
         queryString.append(" ORDER BY OperTime DESC,Number desc");
         Query query;
@@ -92,49 +87,46 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void findInOutMaterialCount(PageUtil pageUtil,String beginTime,String endTime,String type,Long pid,String dids,Long oId) throws JshException {
+    public void findInOutMaterialCount(PageUtil pageUtil, String beginTime, String endTime, String type, Long pid, String dids, Long oId) throws JshException {
         StringBuffer queryString = new StringBuffer();
         queryString.append("select di.MaterialId, m.mName,m.Model,m.categoryName, ");
         //数量汇总
         queryString.append(" (select sum(jdi.BasicNumber) numSum from jsh_depothead jdh INNER JOIN jsh_depotitem jdi " +
                 "on jdh.id=jdi.HeaderId where jdi.MaterialId=di.MaterialId " +
-                " and jdh.type='"+ type +"' and jdh.OperTime >='"+ beginTime +"' and jdh.OperTime <='"+ endTime +"'");
-        if(oId!=null){
-            queryString.append(" and jdh.OrganId = "+ oId );
+                " and jdh.type='" + type + "' and jdh.OperTime >='" + beginTime + "' and jdh.OperTime <='" + endTime + "'");
+        if (oId != null) {
+            queryString.append(" and jdh.OrganId = " + oId);
         }
-        if(pid!=null){
-            queryString.append(" and jdi.DepotId=" + pid );
-        }
-        else {
-            queryString.append(" and jdi.DepotId in (" + dids + ")" );
+        if (pid != null) {
+            queryString.append(" and jdi.DepotId=" + pid);
+        } else {
+            queryString.append(" and jdi.DepotId in (" + dids + ")");
         }
         queryString.append(" ) numSum, ");
         //金额汇总
         queryString.append(" (select sum(jdi.AllPrice) priceSum from jsh_depothead jdh INNER JOIN jsh_depotitem jdi " +
                 "on jdh.id=jdi.HeaderId where jdi.MaterialId=di.MaterialId " +
-                " and jdh.type='"+ type +"' and jdh.OperTime >='"+ beginTime +"' and jdh.OperTime <='"+ endTime +"'");
-        if(oId!=null){
-            queryString.append(" and jdh.OrganId = "+ oId );
-        }
-        if(pid!=null){
-            queryString.append(" and jdi.DepotId=" + pid );
+                " and jdh.type='" + type + "' and jdh.OperTime >='" + beginTime + "' and jdh.OperTime <='" + endTime + "'");
+        if (oId != null) {
+            queryString.append(" and jdh.OrganId = " + oId);
         }
-        else {
-            queryString.append(" and jdi.DepotId in (" + dids + ")" );
+        if (pid != null) {
+            queryString.append(" and jdi.DepotId=" + pid);
+        } else {
+            queryString.append(" and jdi.DepotId in (" + dids + ")");
         }
         queryString.append(" ) priceSum ");
 
         queryString.append(" from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId " +
                 " INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName from jsh_material INNER JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id) m " +
-                " on m.Id=di.MaterialId where dh.type='"+ type +"' and dh.OperTime >='"+ beginTime +"' and dh.OperTime <='"+ endTime +"' ");
-        if(oId!=null){
-            queryString.append(" and dh.OrganId = "+ oId );
-        }
-        if(pid!=null){
-            queryString.append(" and di.DepotId=" + pid );
+                " on m.Id=di.MaterialId where dh.type='" + type + "' and dh.OperTime >='" + beginTime + "' and dh.OperTime <='" + endTime + "' ");
+        if (oId != null) {
+            queryString.append(" and dh.OrganId = " + oId);
         }
-        else {
-            queryString.append(" and di.DepotId in (" + dids + ")" );
+        if (pid != null) {
+            queryString.append(" and di.DepotId=" + pid);
+        } else {
+            queryString.append(" and di.DepotId in (" + dids + ")");
         }
         queryString.append(" GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName ");
         Query query;
@@ -151,29 +143,29 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
     }
 
     @SuppressWarnings("unchecked")
-    public void findMaterialsListByHeaderId(PageUtil pageUtil,Long headerId) throws JshException {
+    public void findMaterialsListByHeaderId(PageUtil pageUtil, Long headerId) throws JshException {
         StringBuffer queryString = new StringBuffer();
         queryString.append("select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model)) as mName from jsh_depotitem inner join jsh_material " +
-                " on jsh_depotitem.MaterialId = jsh_material.Id where jsh_depotitem.HeaderId ="+ headerId);
+                " on jsh_depotitem.MaterialId = jsh_material.Id where jsh_depotitem.HeaderId =" + headerId);
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setPageList(query.list());
     }
 
     @SuppressWarnings("unchecked")
-    public void findStatementAccount(PageUtil pageUtil,String beginTime,String endTime,Long organId,String supType) throws JshException {
+    public void findStatementAccount(PageUtil pageUtil, String beginTime, String endTime, Long organId, String supType) throws JshException {
         StringBuffer queryString = new StringBuffer();
         queryString.append("select dh.Number,concat(dh.SubType,dh.Type) as newType,dh.DiscountLastMoney,dh.ChangeAmount,s.supplier,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_depothead dh " +
                 "inner join jsh_supplier s on s.id=dh.OrganId where s.type='" + supType + "' and dh.SubType!='其它' " +
-                "and dh.OperTime >='"+ beginTime +"' and dh.OperTime<='"+ endTime +"' ");
-        if(organId!=null && !organId.equals("")) {
-            queryString.append(" and dh.OrganId='"+ organId +"' ");
+                "and dh.OperTime >='" + beginTime + "' and dh.OperTime<='" + endTime + "' ");
+        if (organId != null && !organId.equals("")) {
+            queryString.append(" and dh.OrganId='" + organId + "' ");
         }
         queryString.append("UNION ALL " +
                 "select ah.BillNo,ah.Type as newType,ah.TotalPrice,ah.ChangeAmount,s.supplier,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime from jsh_accounthead ah " +
                 "inner join jsh_supplier s on s.id=ah.OrganId where s.type='" + supType + "' " +
-                "and ah.BillTime >='"+ beginTime +"' and ah.BillTime<='"+ endTime +"' ");
-        if(organId!=null && !organId.equals("")) {
-            queryString.append(" and ah.OrganId='"+ organId +"' ");
+                "and ah.BillTime >='" + beginTime + "' and ah.BillTime<='" + endTime + "' ");
+        if (organId != null && !organId.equals("")) {
+            queryString.append(" and ah.OrganId='" + organId + "' ");
         }
         queryString.append(" ORDER BY oTime");
         Query query;
@@ -191,11 +183,11 @@ public class DepotHeadDAO extends BaseDAO<DepotHead> implements DepotHeadIDAO {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void getHeaderIdByMaterial(PageUtil pageUtil,String materialParam,String depotIds) throws JshException {
+    public void getHeaderIdByMaterial(PageUtil pageUtil, String materialParam, String depotIds) throws JshException {
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select dt.HeaderId from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where ( m.`Name` "+
+        queryString.append("select dt.HeaderId from jsh_depotitem dt INNER JOIN jsh_material m on dt.MaterialId = m.Id where ( m.`Name` " +
                 " like '%" + materialParam + "%' or m.Model like '%" + materialParam + "%') ");
-        if(!depotIds.equals("")){
+        if (!depotIds.equals("")) {
             queryString.append(" and dt.DepotId in (" + depotIds + ") ");
         }
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));

src/main/java/com/jsh/dao/materials/DepotItemDAO.java

@@ -8,6 +8,11 @@ import com.jsh.util.SearchConditionUtil;
 import org.hibernate.Query;
 
 public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO {
+    private final static String TYPE = "入库";
+    private final static String SUM_TYPE = "Number";
+    private final static String IN = "in";
+    private final static String OUT = "out";
+
     /**
      * 设置dao映射基类
      *
@@ -18,8 +23,6 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO {
         return DepotItem.class;
     }
 
-    private final static String TYPE = "入库";
-
     @SuppressWarnings("unchecked")
     @Override
     public void findByType(PageUtil<DepotItem> pageUtil, String type, Integer dId, Long MId, String MonthTime, Boolean isPrev) throws JshException {
@@ -133,8 +136,6 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO {
         pageUtil.setPageList(query.list());
     }
 
-    private final static String SUM_TYPE = "Number";
-
     @SuppressWarnings("unchecked")
     @Override
     public void buyOrSale(PageUtil<DepotItem> pageUtil, String type, String subType, Long MId, String MonthTime, String sumType) throws JshException {
@@ -149,9 +150,6 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO {
         pageUtil.setPageList(query.list());
     }
 
-    private final static String IN = "in";
-    private final static String OUT = "out";
-
     @SuppressWarnings("unchecked")
     @Override
     public void findGiftByType(PageUtil<DepotItem> pageUtil, String subType, Integer ProjectId, Long MId, String type) throws JshException {

src/main/java/com/jsh/dao/materials/DepotItemIDAO.java

 package com.jsh.dao.materials;
 
 import com.jsh.base.BaseIDAO;
-import com.jsh.util.JshException;
-import com.jsh.model.po.DepotHead;
 import com.jsh.model.po.DepotItem;
+import com.jsh.util.JshException;
 import com.jsh.util.PageUtil;
 
-public interface DepotItemIDAO extends BaseIDAO<DepotItem>
-{
-    public void findByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId, String MonthTime,Boolean isPrev) throws JshException;
+public interface DepotItemIDAO extends BaseIDAO<DepotItem> {
+    public void findByType(PageUtil<DepotItem> pageUtil, String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) throws JshException;
 
-    public void findByTypeAndMaterialId(PageUtil<DepotItem> pageUtil,String type,Long MId) throws JshException;
+    public void findByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, String type, Long MId) throws JshException;
 
-    public void findDetailByTypeAndMaterialId(PageUtil<DepotItem> pageUtil,Long MId) throws JshException;
+    public void findDetailByTypeAndMaterialId(PageUtil<DepotItem> pageUtil, Long MId) throws JshException;
 
-    public void findPriceByType(PageUtil<DepotItem> pageUtil,String type,Integer ProjectId,Long MId, String MonthTime,Boolean isPrev) throws JshException;
+    public void findPriceByType(PageUtil<DepotItem> pageUtil, String type, Integer ProjectId, Long MId, String MonthTime, Boolean isPrev) throws JshException;
 
-    public void buyOrSale(PageUtil<DepotItem> pageUtil,String type, String subType,Long MId, String MonthTime, String sumType) throws JshException;
+    public void buyOrSale(PageUtil<DepotItem> pageUtil, String type, String subType, Long MId, String MonthTime, String sumType) throws JshException;
 
-    public void findGiftByType(PageUtil<DepotItem> pageUtil,String subType,Integer ProjectId,Long MId, String type) throws JshException;
+    public void findGiftByType(PageUtil<DepotItem> pageUtil, String subType, Integer ProjectId, Long MId, String type) throws JshException;
 }

src/main/java/com/jsh/dao/materials/MaterialCategoryDAO.java

@@ -3,15 +3,14 @@ package com.jsh.dao.materials;
 import com.jsh.base.BaseDAO;
 import com.jsh.model.po.MaterialCategory;
 
-public class MaterialCategoryDAO extends BaseDAO<MaterialCategory> implements MaterialCategoryIDAO
-{
-	/**
+public class MaterialCategoryDAO extends BaseDAO<MaterialCategory> implements MaterialCategoryIDAO {
+    /**
      * 设置dao映射基类
+     *
      * @return
      */
-	@Override
-    public Class<MaterialCategory> getEntityClass()
-    {
+    @Override
+    public Class<MaterialCategory> getEntityClass() {
         return MaterialCategory.class;
     }
 }

src/main/java/com/jsh/dao/materials/MaterialCategoryIDAO.java

@@ -3,7 +3,6 @@ package com.jsh.dao.materials;
 import com.jsh.base.BaseIDAO;
 import com.jsh.model.po.MaterialCategory;
 
-public interface MaterialCategoryIDAO extends BaseIDAO<MaterialCategory>
-{
-	
+public interface MaterialCategoryIDAO extends BaseIDAO<MaterialCategory> {
+
 }

src/main/java/com/jsh/dao/materials/MaterialDAO.java

@@ -7,32 +7,31 @@ import com.jsh.util.PageUtil;
 import com.jsh.util.SearchConditionUtil;
 import org.hibernate.Query;
 
-public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO
-{
-	/**
+public class MaterialDAO extends BaseDAO<Material> implements MaterialIDAO {
+    /**
      * 设置dao映射基类
+     *
      * @return
      */
-	@Override
-    public Class<Material> getEntityClass()
-    {
+    @Override
+    public Class<Material> getEntityClass() {
         return Material.class;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public void batchSetEnable(Boolean enable,String supplierIDs) {
-        String sql="update jsh_material m set m.enabled=" + enable + " where m.id in (" + supplierIDs + ")";
+    public void batchSetEnable(Boolean enable, String supplierIDs) {
+        String sql = "update jsh_material m set m.enabled=" + enable + " where m.id in (" + supplierIDs + ")";
         Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(sql);
         query.executeUpdate();
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public void findUnitName(PageUtil<Material> pageUtil,Long mId) throws JshException {
+    public void findUnitName(PageUtil<Material> pageUtil, Long mId) throws JshException {
         //多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便,
         StringBuffer queryString = new StringBuffer();
-        queryString.append("select jsh_unit.UName  from jsh_unit inner join jsh_material on UnitId=jsh_unit.id where jsh_material.id="+mId);
+        queryString.append("select jsh_unit.UName  from jsh_unit inner join jsh_material on UnitId=jsh_unit.id where jsh_material.id=" + mId);
         Query query;
         query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
         pageUtil.setTotalCount(query.list().size());

src/main/java/com/jsh/dao/materials/MaterialIDAO.java

@@ -5,9 +5,8 @@ import com.jsh.model.po.Material;
 import com.jsh.util.JshException;
 import com.jsh.util.PageUtil;
 
-public interface MaterialIDAO extends BaseIDAO<Material>
-{
-    public void batchSetEnable(Boolean enable,String supplierIDs);
+public interface MaterialIDAO extends BaseIDAO<Material> {
+    public void batchSetEnable(Boolean enable, String supplierIDs);
 
-    public void findUnitName(PageUtil<Material> pageUtil,Long mId) throws JshException;
+    public void findUnitName(PageUtil<Material> pageUtil, Long mId) throws JshException;
 }

src/main/java/com/jsh/dao/materials/MaterialPropertyDAO.java

@@ -3,15 +3,14 @@ package com.jsh.dao.materials;
 import com.jsh.base.BaseDAO;
 import com.jsh.model.po.MaterialProperty;
 
-public class MaterialPropertyDAO extends BaseDAO<MaterialProperty> implements MaterialPropertyIDAO
-{
-	/**
+public class MaterialPropertyDAO extends BaseDAO<MaterialProperty> implements MaterialPropertyIDAO {
+    /**
      * 设置dao映射基类
+     *
      * @return
      */
-	@Override
-    public Class<MaterialProperty> getEntityClass()
-    {
+    @Override
+    public Class<MaterialProperty> getEntityClass() {
         return MaterialProperty.class;
     }
 }

src/main/java/com/jsh/dao/materials/MaterialPropertyIDAO.java

@@ -3,7 +3,6 @@ package com.jsh.dao.materials;
 import com.jsh.base.BaseIDAO;
 import com.jsh.model.po.MaterialProperty;
 
-public interface MaterialPropertyIDAO extends BaseIDAO<MaterialProperty>
-{
-	
+public interface MaterialPropertyIDAO extends BaseIDAO<MaterialProperty> {
+
 }

src/main/java/com/jsh/dao/materials/PersonDAO.java

@@ -3,15 +3,14 @@ package com.jsh.dao.materials;
 import com.jsh.base.BaseDAO;
 import com.jsh.model.po.Person;
 
-public class PersonDAO extends BaseDAO<Person> implements PersonIDAO
-{
-	/**
+public class PersonDAO extends BaseDAO<Person> implements PersonIDAO {
+    /**
      * 设置dao映射基类
+     *
      * @return
      */
-	@Override
-    public Class<Person> getEntityClass()
-    {
+    @Override
+    public Class<Person> getEntityClass() {
         return Person.class;
     }
 }

src/main/java/com/jsh/dao/materials/PersonIDAO.java

@@ -3,7 +3,6 @@ package com.jsh.dao.materials;
 import com.jsh.base.BaseIDAO;
 import com.jsh.model.po.Person;
 
-public interface PersonIDAO extends BaseIDAO<Person>
-{
-	
+public interface PersonIDAO extends BaseIDAO<Person> {
+
 }

src/main/java/com/jsh/model/po/Account.java

 package com.jsh.model.po;
 
 @SuppressWarnings("serial")
-public class Account implements java.io.Serializable
-{
+public class Account implements java.io.Serializable {
     private Long Id;
     private String Name;
     private String SerialNo;
@@ -11,13 +10,11 @@ public class Account implements java.io.Serializable
     private Boolean IsDefault;
     private String Remark;
 
-    public Account()
-    {
+    public Account() {
 
     }
 
-    public Account(Long Id)
-    {
+    public Account(Long Id) {
         this.Id = Id;
     }
 
@@ -30,56 +27,46 @@ public class Account implements java.io.Serializable
         Remark = remark;
     }
 
-    public void setId(Long id)
-    {
-        Id = id;
-    }
-
-    public Long getId()
-    {
+    public Long getId() {
         return Id;
     }
 
-    public void setName(String name)
-    {
-        Name = name;
+    public void setId(Long id) {
+        Id = id;
     }
 
-    public String getName()
-    {
+    public String getName() {
         return Name;
     }
 
-    public void setSerialNo(String serialNo)
-    {
-        SerialNo = serialNo;
+    public void setName(String name) {
+        Name = name;
     }
 
-    public String getSerialNo()
-    {
+    public String getSerialNo() {
         return SerialNo;
     }
 
-    public void setInitialAmount(Double initialAmount)
-    {
-        InitialAmount = initialAmount;
+    public void setSerialNo(String serialNo) {
+        SerialNo = serialNo;
     }
 
-    public Double getInitialAmount()
-    {
+    public Double getInitialAmount() {
         return InitialAmount;
     }
 
-    public void setCurrentAmount(Double currentAmount)
-    {
-        CurrentAmount = currentAmount;
+    public void setInitialAmount(Double initialAmount) {
+        InitialAmount = initialAmount;
     }
 
-    public Double getCurrentAmount()
-    {
+    public Double getCurrentAmount() {
         return CurrentAmount;
     }
 
+    public void setCurrentAmount(Double currentAmount) {
+        CurrentAmount = currentAmount;
+    }
+
     public Boolean getIsDefault() {
         return IsDefault;
     }
@@ -88,13 +75,11 @@ public class Account implements java.io.Serializable
         IsDefault = isDefault;
     }
 
-    public void setRemark(String remark)
-    {
-        Remark = remark;
+    public String getRemark() {
+        return Remark;
     }
 
-    public String getRemark()
-    {
-        return Remark;
-    } 
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
 }

src/main/java/com/jsh/model/po/AccountHead.java

@@ -3,33 +3,29 @@ package com.jsh.model.po;
 import java.sql.Timestamp;
 
 @SuppressWarnings("serial")
-public class AccountHead implements java.io.Serializable
-{
+public class AccountHead implements java.io.Serializable {
     private Long Id;
     private String Type;
     private Supplier OrganId;
-    private Person HandsPersonId;    
+    private Person HandsPersonId;
     private Double ChangeAmount;
     private Double TotalPrice;
     private Account AccountId;
     private String BillNo;
-    private Timestamp BillTime;  
+    private Timestamp BillTime;
     private String Remark;
 
-    public AccountHead()
-    {
+    public AccountHead() {
 
     }
 
-    public AccountHead(Long Id)
-    {
-        this.Id = Id ;
+    public AccountHead(Long Id) {
+        this.Id = Id;
     }
 
     public AccountHead(String type, Supplier organId,
-    	Person handsPersonId, Double changeAmount, Double totalPrice, 
-        Account accountId, String billNo, Timestamp billTime, String remark)
-    {
+                       Person handsPersonId, Double changeAmount, Double totalPrice,
+                       Account accountId, String billNo, Timestamp billTime, String remark) {
         super();
         Type = type;
         OrganId = organId;
@@ -42,102 +38,84 @@ public class AccountHead implements java.io.Serializable
         Remark = remark;
     }
 
-    public void setId(Long id)
-    {
+    public Long getId() {
+        return Id;
+    }
+
+    public void setId(Long id) {
         Id = id;
     }
 
-    public Long getId()
-    {
-        return Id;
+    public String getType() {
+        return Type;
     }
 
-    public void setType(String type)
-    {
+    public void setType(String type) {
         Type = type;
     }
 
-    public String getType()
-    {
-        return Type;
+    public Supplier getOrganId() {
+        return OrganId;
     }
 
-    public void setOrganId(Supplier organId)
-    {
+    public void setOrganId(Supplier organId) {
         OrganId = organId;
     }
 
-    public Supplier getOrganId()
-    {
-        return OrganId;
+    public Person getHandsPersonId() {
+        return HandsPersonId;
     }
 
-    public void setHandsPersonId(Person handsPersonId)
-    {
+    public void setHandsPersonId(Person handsPersonId) {
         HandsPersonId = handsPersonId;
     }
 
-    public Person getHandsPersonId()
-    {
-        return HandsPersonId;
+    public Double getChangeAmount() {
+        return ChangeAmount;
     }
 
-    public void setChangeAmount(Double changeAmount)
-    {
+    public void setChangeAmount(Double changeAmount) {
         ChangeAmount = changeAmount;
     }
 
-    public Double getChangeAmount()
-    {
-        return ChangeAmount;
+    public Double getTotalPrice() {
+        return TotalPrice;
     }
-    
-	public void setTotalPrice(Double totalPrice) {
-		TotalPrice = totalPrice;
-	}
-	
-	public Double getTotalPrice() {
-		return TotalPrice;
-	}
-
-	public void setAccountId(Account accountId)
-    {
-        AccountId = accountId;
+
+    public void setTotalPrice(Double totalPrice) {
+        TotalPrice = totalPrice;
     }
 
-    public Account getAccountId()
-    {
+    public Account getAccountId() {
         return AccountId;
     }
 
-    public void setBillNo(String billNo)
-    {
-        BillNo = billNo;
+    public void setAccountId(Account accountId) {
+        AccountId = accountId;
     }
 
-    public String getBillNo()
-    {
+    public String getBillNo() {
         return BillNo;
     }
 
-    public void setBillTime(Timestamp billTime)
-    {
-        BillTime = billTime;
+    public void setBillNo(String billNo) {
+        BillNo = billNo;
     }
 
-    public Timestamp getBillTime()
-    {
+    public Timestamp getBillTime() {
         return BillTime;
     }
 
-    public void setRemark(String remark)
-    {
-        Remark = remark;
+    public void setBillTime(Timestamp billTime) {
+        BillTime = billTime;
     }
 
-    public String getRemark()
-    {
+    public String getRemark() {
         return Remark;
     }
 
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
+
 }

src/main/java/com/jsh/model/po/AccountItem.java

 package com.jsh.model.po;
 
 @SuppressWarnings("serial")
-public class AccountItem implements java.io.Serializable
-{
+public class AccountItem implements java.io.Serializable {
     private Long Id;
     private AccountHead HeaderId;
     private Account AccountId;
@@ -10,19 +9,16 @@ public class AccountItem implements java.io.Serializable
     private Double EachAmount;
     private String Remark;
 
-    public AccountItem()
-    {
+    public AccountItem() {
 
     }
 
-    public AccountItem(Long Id)
-    {
-        this.Id = Id ;
+    public AccountItem(Long Id) {
+        this.Id = Id;
     }
 
     public AccountItem(AccountHead headerId, Account accountId,
-                       InOutItem inOutItemId, Double eachAmount, String remark)
-    {
+                       InOutItem inOutItemId, Double eachAmount, String remark) {
         super();
         HeaderId = headerId;
         AccountId = accountId;
@@ -31,64 +27,52 @@ public class AccountItem implements java.io.Serializable
         Remark = remark;
     }
 
-    public void setId(Long id)
-    {
-        Id = id;
-    }
-
-    public Long getId()
-    {
+    public Long getId() {
         return Id;
     }
 
-    public void setHeaderId(AccountHead headerId)
-    {
-        HeaderId = headerId;
+    public void setId(Long id) {
+        Id = id;
     }
 
-    public AccountHead getHeaderId()
-    {
+    public AccountHead getHeaderId() {
         return HeaderId;
     }
 
-    public void setAccountId(Account accountId)
-    {
-        AccountId = accountId;
+    public void setHeaderId(AccountHead headerId) {
+        HeaderId = headerId;
     }
 
-    public Account getAccountId()
-    {
+    public Account getAccountId() {
         return AccountId;
     }
 
-    public void setInOutItemId(InOutItem inOutItemId)
-    {
-        InOutItemId = inOutItemId;
+    public void setAccountId(Account accountId) {
+        AccountId = accountId;
     }
 
-    public InOutItem getInOutItemId()
-    {
+    public InOutItem getInOutItemId() {
         return InOutItemId;
     }
 
-    public void setEachAmount(Double eachAmount)
-    {
-        EachAmount = eachAmount;
+    public void setInOutItemId(InOutItem inOutItemId) {
+        InOutItemId = inOutItemId;
     }
 
-    public Double getEachAmount()
-    {
+    public Double getEachAmount() {
         return EachAmount;
     }
 
-    public void setRemark(String remark)
-    {
-        Remark = remark;
+    public void setEachAmount(Double eachAmount) {
+        EachAmount = eachAmount;
     }
 
-    public String getRemark()
-    {
+    public String getRemark() {
         return Remark;
     }
 
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
+
 }

src/main/java/com/jsh/model/po/App.java

 package com.jsh.model.po;
 
 @SuppressWarnings("serial")
-public class App implements java.io.Serializable
-{
-	private Long Id;
-	private String Number;
-	private String Name;
-	private String Type;
-	private String Icon;
-	private String URL;
-	private String Width;
-	private String Height;
-	private Boolean ReSize;
-	private Boolean OpenMax;
-	private Boolean Flash;
-	private String ZL;
-	private String Sort;
-	private String Remark;
-	private Boolean Enabled;
-	
-	
-	public App()
-	{
-		
-	}
-	
-	public App(Long Id)
-	{
-		this.Id = Id ;
-	}
-
-	public App(String Number, String Name, String Type, String Icon, String URL, String Width, 
-			String Height, Boolean ReSize, Boolean OpenMax, Boolean Flash, String ZL, String Sort, 
-			String Remark, Boolean Enabled)
-	{
-		this.Number = Number;
-		this.Name = Name;
-		this.Type = Type;
-		this.Icon = Icon;
-		this.URL = URL;
-		this.Width = Width;
-		this.Height = Height;
-		this.ReSize = ReSize;
-		this.OpenMax = OpenMax;
-		this.Flash = Flash;
-		this.ZL = ZL;
-		this.Sort = Sort;
-		this.Remark = Remark;
-		this.Enabled = Enabled;
-	}
-
-	public Long getId() {
-		return Id;
-	}
-
-	public void setId(Long id) {
-		Id = id;
-	}
-
-	public String getNumber() {
-		return Number;
-	}
-
-	public void setNumber(String number) {
-		Number = number;
-	}
-
-	public String getName() {
-		return Name;
-	}
-
-	public void setName(String name) {
-		Name = name;
-	}
-
-	public String getType() {
-		return Type;
-	}
-
-	public void setType(String type) {
-		Type = type;
-	}
-
-	public String getIcon() {
-		return Icon;
-	}
-
-	public void setIcon(String icon) {
-		Icon = icon;
-	}
-
-	public String getURL() {
-		return URL;
-	}
-
-	public void setURL(String uRL) {
-		URL = uRL;
-	}
-
-	public String getWidth() {
-		return Width;
-	}
-
-	public void setWidth(String width) {
-		Width = width;
-	}
-
-	public String getHeight() {
-		return Height;
-	}
-
-	public void setHeight(String height) {
-		Height = height;
-	}
-
-	public Boolean getReSize() {
-		return ReSize;
-	}
-
-	public void setReSize(Boolean reSize) {
-		ReSize = reSize;
-	}
-
-	public Boolean getOpenMax() {
-		return OpenMax;
-	}
-
-	public void setOpenMax(Boolean openMax) {
-		OpenMax = openMax;
-	}
-
-	public Boolean getFlash() {
-		return Flash;
-	}
-
-	public void setFlash(Boolean flash) {
-		Flash = flash;
-	}
-
-	public String getZL() {
-		return ZL;
-	}
-
-	public void setZL(String zL) {
-		ZL = zL;
-	}
-
-	public String getSort() {
-		return Sort;
-	}
+public class App implements java.io.Serializable {
+    private Long Id;
+    private String Number;
+    private String Name;
+    private String Type;
+    private String Icon;
+    private String URL;
+    private String Width;
+    private String Height;
+    private Boolean ReSize;
+    private Boolean OpenMax;
+    private Boolean Flash;
+    private String ZL;
+    private String Sort;
+    private String Remark;
+    private Boolean Enabled;
+
+
+    public App() {
+
+    }
+
+    public App(Long Id) {
+        this.Id = Id;
+    }
+
+    public App(String Number, String Name, String Type, String Icon, String URL, String Width,
+               String Height, Boolean ReSize, Boolean OpenMax, Boolean Flash, String ZL, String Sort,
+               String Remark, Boolean Enabled) {
+        this.Number = Number;
+        this.Name = Name;
+        this.Type = Type;
+        this.Icon = Icon;
+        this.URL = URL;
+        this.Width = Width;
+        this.Height = Height;
+        this.ReSize = ReSize;
+        this.OpenMax = OpenMax;
+        this.Flash = Flash;
+        this.ZL = ZL;
+        this.Sort = Sort;
+        this.Remark = Remark;
+        this.Enabled = Enabled;
+    }
+
+    public Long getId() {
+        return Id;
+    }
+
+    public void setId(Long id) {
+        Id = id;
+    }
+
+    public String getNumber() {
+        return Number;
+    }
+
+    public void setNumber(String number) {
+        Number = number;
+    }
+
+    public String getName() {
+        return Name;
+    }
+
+    public void setName(String name) {
+        Name = name;
+    }
+
+    public String getType() {
+        return Type;
+    }
+
+    public void setType(String type) {
+        Type = type;
+    }
+
+    public String getIcon() {
+        return Icon;
+    }
+
+    public void setIcon(String icon) {
+        Icon = icon;
+    }
+
+    public String getURL() {
+        return URL;
+    }
+
+    public void setURL(String uRL) {
+        URL = uRL;
+    }
+
+    public String getWidth() {
+        return Width;
+    }
+
+    public void setWidth(String width) {
+        Width = width;
+    }
+
+    public String getHeight() {
+        return Height;
+    }
+
+    public void setHeight(String height) {
+        Height = height;
+    }
+
+    public Boolean getReSize() {
+        return ReSize;
+    }
+
+    public void setReSize(Boolean reSize) {
+        ReSize = reSize;
+    }
+
+    public Boolean getOpenMax() {
+        return OpenMax;
+    }
+
+    public void setOpenMax(Boolean openMax) {
+        OpenMax = openMax;
+    }
+
+    public Boolean getFlash() {
+        return Flash;
+    }
+
+    public void setFlash(Boolean flash) {
+        Flash = flash;
+    }
+
+    public String getZL() {
+        return ZL;
+    }
+
+    public void setZL(String zL) {
+        ZL = zL;
+    }
+
+    public String getSort() {
+        return Sort;
+    }
 
-	public void setSort(String sort) {
-		Sort = sort;
-	}
+    public void setSort(String sort) {
+        Sort = sort;
+    }
 
-	public String getRemark() {
-		return Remark;
-	}
+    public String getRemark() {
+        return Remark;
+    }
 
-	public void setRemark(String remark) {
-		Remark = remark;
-	}
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
 
-	public Boolean getEnabled() {
-		return Enabled;
-	}
+    public Boolean getEnabled() {
+        return Enabled;
+    }
 
-	public void setEnabled(Boolean enabled) {
-		Enabled = enabled;
-	}
+    public void setEnabled(Boolean enabled) {
+        Enabled = enabled;
+    }
 
 
 }
\ No newline at end of file

src/main/java/com/jsh/model/po/Asset.java

@@ -4,376 +4,317 @@ import java.sql.Timestamp;
 import java.util.Map;
 
 @SuppressWarnings("serial")
-public class Asset implements java.io.Serializable
-{
-	private Long id;
-	private Assetname assetname;
-	private String location;
-	private Short status;
-	private Basicuser user;
-	private Double price;
-	private Timestamp purchasedate;
-	private Timestamp periodofvalidity;
-	private Timestamp warrantydate;
-	private String assetnum;
-	private String serialnum;
-	private Supplier supplier;
-	private String labels;
-	private String description;
-	private String addMonth;
-	private Timestamp createtime;
-	private Basicuser creator;
-	private Timestamp updatetime;
-	private Basicuser updator;
-	
-	//----------以下属性导入exel表格使用--------------------
-	/**
+public class Asset implements java.io.Serializable {
+    private Long id;
+    private Assetname assetname;
+    private String location;
+    private Short status;
+    private Basicuser user;
+    private Double price;
+    private Timestamp purchasedate;
+    private Timestamp periodofvalidity;
+    private Timestamp warrantydate;
+    private String assetnum;
+    private String serialnum;
+    private Supplier supplier;
+    private String labels;
+    private String description;
+    private String addMonth;
+    private Timestamp createtime;
+    private Basicuser creator;
+    private Timestamp updatetime;
+    private Basicuser updator;
+
+    //----------以下属性导入exel表格使用--------------------
+    /**
      * 类型 right--正确 warn--警告  wrong--错误
      */
-    private Map<Integer,String> cellInfo;
-    
+    private Map<Integer, String> cellInfo;
+
     /**
      * 行号
      */
     private Integer rowLineNum;
-    
+
     /**
      * 保存价格
      */
     private String priceStr;
-    
+
     /**
      * 资产名称
      */
     private String assetnameStr;
-    
+
     /**
      * 资产类型
      */
     private String category;
-    
+
     /**
      * 购买日期
      */
     private String purchasedateStr;
-    
+
     /**
      * 有效日期
      */
     private String periodofvalidityStr;
-    
+
     /**
      * 保修日期
      */
     private String warrantydateStr;
-    
-	public Asset()
-	{
-		
-	}
-	
-	public Asset(Long id)
-	{
-		this.id = id;
-	}
-	
-	public Asset(Assetname assetname, String location,
-			Short status, Basicuser user, Double price, Timestamp purchasedate,
-			Timestamp periodofvalidity, Timestamp warrantydate,
-			String assetnum, String serialnum, Supplier supplier,
-			String description, Timestamp createtime, Basicuser creator,
-			Timestamp updatetime,String labels, Basicuser updator,String addMonth)
-	{
-		super();
-		this.assetname = assetname;
-		this.location = location;
-		this.status = status;
-		this.user = user;
-		this.price = price;
-		this.purchasedate = purchasedate;
-		this.periodofvalidity = periodofvalidity;
-		this.warrantydate = warrantydate;
-		this.assetnum = assetnum;
-		this.serialnum = serialnum;
-		this.supplier = supplier;
-		this.description = description;
-		this.createtime = createtime;
-		this.creator = creator;
-		this.updatetime = updatetime;
-		this.updator = updator;
-		this.labels = labels;
-		this.addMonth = addMonth;
-	}
-
-
-
-	public Long getId()
-	{
-		return id;
-	}
-
-	public void setId(Long id)
-	{
-		this.id = id;
-	}
-
-	public Assetname getAssetname()
-	{
-		return assetname;
-	}
-
-	public void setAssetname(Assetname assetname)
-	{
-		this.assetname = assetname;
-	}
-
-	public String getLocation()
-	{
-		return location;
-	}
-
-	public void setLocation(String location)
-	{
-		this.location = location;
-	}
-
-	public Short getStatus()
-	{
-		return status;
-	}
-
-	public void setStatus(Short status)
-	{
-		this.status = status;
-	}
-
-	public Basicuser getUser()
-	{
-		return user;
-	}
-
-	public void setUser(Basicuser user)
-	{
-		this.user = user;
-	}
-
-	public Double getPrice()
-	{
-		return price;
-	}
-
-	public void setPrice(Double price)
-	{
-		this.price = price;
-	}
-
-	public Timestamp getPurchasedate()
-	{
-		return purchasedate;
-	}
-
-	public void setPurchasedate(Timestamp purchasedate)
-	{
-		this.purchasedate = purchasedate;
-	}
-
-	public Timestamp getPeriodofvalidity()
-	{
-		return periodofvalidity;
-	}
-
-	public void setPeriodofvalidity(Timestamp periodofvalidity)
-	{
-		this.periodofvalidity = periodofvalidity;
-	}
-
-	public Timestamp getWarrantydate()
-	{
-		return warrantydate;
-	}
-
-	public void setWarrantydate(Timestamp warrantydate)
-	{
-		this.warrantydate = warrantydate;
-	}
-
-	public String getAssetnum()
-	{
-		return assetnum;
-	}
-
-	public void setAssetnum(String assetnum)
-	{
-		this.assetnum = assetnum;
-	}
-
-	public String getSerialnum()
-	{
-		return serialnum;
-	}
-
-	public void setSerialnum(String serialnum)
-	{
-		this.serialnum = serialnum;
-	}
-
-	public Supplier getSupplier()
-	{
-		return supplier;
-	}
-
-	public void setSupplier(Supplier supplier)
-	{
-		this.supplier = supplier;
-	}
-
-	public String getDescription()
-	{
-		return description;
-	}
-
-	public void setDescription(String description)
-	{
-		this.description = description;
-	}
-
-	public Timestamp getCreatetime()
-	{
-		return createtime;
-	}
-
-	public void setCreatetime(Timestamp createtime)
-	{
-		this.createtime = createtime;
-	}
-
-	public Basicuser getCreator()
-	{
-		return creator;
-	}
-
-	public void setCreator(Basicuser creator)
-	{
-		this.creator = creator;
-	}
-
-	public Timestamp getUpdatetime()
-	{
-		return updatetime;
-	}
-
-	public void setUpdatetime(Timestamp updatetime)
-	{
-		this.updatetime = updatetime;
-	}
-
-	public Basicuser getUpdator()
-	{
-		return updator;
-	}
-
-	public void setUpdator(Basicuser updator)
-	{
-		this.updator = updator;
-	}
-
-    public String getLabels()
-    {
+
+    public Asset() {
+
+    }
+
+    public Asset(Long id) {
+        this.id = id;
+    }
+
+    public Asset(Assetname assetname, String location,
+                 Short status, Basicuser user, Double price, Timestamp purchasedate,
+                 Timestamp periodofvalidity, Timestamp warrantydate,
+                 String assetnum, String serialnum, Supplier supplier,
+                 String description, Timestamp createtime, Basicuser creator,
+                 Timestamp updatetime, String labels, Basicuser updator, String addMonth) {
+        super();
+        this.assetname = assetname;
+        this.location = location;
+        this.status = status;
+        this.user = user;
+        this.price = price;
+        this.purchasedate = purchasedate;
+        this.periodofvalidity = periodofvalidity;
+        this.warrantydate = warrantydate;
+        this.assetnum = assetnum;
+        this.serialnum = serialnum;
+        this.supplier = supplier;
+        this.description = description;
+        this.createtime = createtime;
+        this.creator = creator;
+        this.updatetime = updatetime;
+        this.updator = updator;
+        this.labels = labels;
+        this.addMonth = addMonth;
+    }
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Assetname getAssetname() {
+        return assetname;
+    }
+
+    public void setAssetname(Assetname assetname) {
+        this.assetname = assetname;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public Basicuser getUser() {
+        return user;
+    }
+
+    public void setUser(Basicuser user) {
+        this.user = user;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Timestamp getPurchasedate() {
+        return purchasedate;
+    }
+
+    public void setPurchasedate(Timestamp purchasedate) {
+        this.purchasedate = purchasedate;
+    }
+
+    public Timestamp getPeriodofvalidity() {
+        return periodofvalidity;
+    }
+
+    public void setPeriodofvalidity(Timestamp periodofvalidity) {
+        this.periodofvalidity = periodofvalidity;
+    }
+
+    public Timestamp getWarrantydate() {
+        return warrantydate;
+    }
+
+    public void setWarrantydate(Timestamp warrantydate) {
+        this.warrantydate = warrantydate;
+    }
+
+    public String getAssetnum() {
+        return assetnum;
+    }
+
+    public void setAssetnum(String assetnum) {
+        this.assetnum = assetnum;
+    }
+
+    public String getSerialnum() {
+        return serialnum;
+    }
+
+    public void setSerialnum(String serialnum) {
+        this.serialnum = serialnum;
+    }
+
+    public Supplier getSupplier() {
+        return supplier;
+    }
+
+    public void setSupplier(Supplier supplier) {
+        this.supplier = supplier;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Timestamp getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Timestamp createtime) {
+        this.createtime = createtime;
+    }
+
+    public Basicuser getCreator() {
+        return creator;
+    }
+
+    public void setCreator(Basicuser creator) {
+        this.creator = creator;
+    }
+
+    public Timestamp getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Timestamp updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public Basicuser getUpdator() {
+        return updator;
+    }
+
+    public void setUpdator(Basicuser updator) {
+        this.updator = updator;
+    }
+
+    public String getLabels() {
         return labels;
     }
 
-    public void setLabels(String labels)
-    {
+    public void setLabels(String labels) {
         this.labels = labels;
     }
 
-    public String getAddMonth()
-    {
+    public String getAddMonth() {
         return addMonth;
     }
 
-    public void setAddMonth(String addMonth)
-    {
+    public void setAddMonth(String addMonth) {
         this.addMonth = addMonth;
     }
 
-    public Integer getRowLineNum()
-    {
+    public Integer getRowLineNum() {
         return rowLineNum;
     }
 
-    public void setRowLineNum(Integer rowLineNum)
-    {
+    public void setRowLineNum(Integer rowLineNum) {
         this.rowLineNum = rowLineNum;
     }
 
-    public Map<Integer, String> getCellInfo()
-    {
+    public Map<Integer, String> getCellInfo() {
         return cellInfo;
     }
 
-    public void setCellInfo(Map<Integer, String> cellInfo)
-    {
+    public void setCellInfo(Map<Integer, String> cellInfo) {
         this.cellInfo = cellInfo;
     }
 
-    public String getPriceStr()
-    {
+    public String getPriceStr() {
         return priceStr;
     }
 
-    public void setPriceStr(String priceStr)
-    {
+    public void setPriceStr(String priceStr) {
         this.priceStr = priceStr;
     }
 
-    public String getAssetnameStr()
-    {
+    public String getAssetnameStr() {
         return assetnameStr;
     }
 
-    public void setAssetnameStr(String assetnameStr)
-    {
+    public void setAssetnameStr(String assetnameStr) {
         this.assetnameStr = assetnameStr;
     }
 
-    public String getCategory()
-    {
+    public String getCategory() {
         return category;
     }
 
-    public void setCategory(String category)
-    {
+    public void setCategory(String category) {
         this.category = category;
     }
 
-    public String getPurchasedateStr()
-    {
+    public String getPurchasedateStr() {
         return purchasedateStr;
     }
 
-    public void setPurchasedateStr(String purchasedateStr)
-    {
+    public void setPurchasedateStr(String purchasedateStr) {
         this.purchasedateStr = purchasedateStr;
     }
 
-    public String getPeriodofvalidityStr()
-    {
+    public String getPeriodofvalidityStr() {
         return periodofvalidityStr;
     }
 
-    public void setPeriodofvalidityStr(String periodofvalidityStr)
-    {
+    public void setPeriodofvalidityStr(String periodofvalidityStr) {
         this.periodofvalidityStr = periodofvalidityStr;
     }
 
-    public String getWarrantydateStr()
-    {
+    public String getWarrantydateStr() {
         return warrantydateStr;
     }
 
-    public void setWarrantydateStr(String warrantydateStr)
-    {
+    public void setWarrantydateStr(String warrantydateStr) {
         this.warrantydateStr = warrantydateStr;
     }
 }
\ No newline at end of file