合并分支

pom.xml

@@ -20,7 +20,6 @@
                 <!-- static plugin -->
                 <static-path>static</static-path>
             </properties>
-
         </profile>
         <profile>
             <!-- 测试环境 -->
@@ -31,7 +30,9 @@
                 <static-path>static</static-path>
             </properties>
 
-
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <!-- 生产环境 -->
@@ -42,9 +43,7 @@
                 <static-path>http://static.ubtob.com</static-path>
             </properties>
             <!-- 默认 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+
         </profile>
     </profiles>
     <dependencies>
@@ -299,11 +298,11 @@
             </exclusions>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.uas.sso</groupId>-->
-            <!--<artifactId>sso-common</artifactId>-->
-            <!--<version>0.0.1-SNAPSHOT</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.uas.sso</groupId>
+            <artifactId>sso-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>com.uas.ps</groupId>

src/main/java/com/uas/platform/b2b/controller/ProductUserBatchController.java

@@ -1,45 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import com.uas.platform.b2b.service.PurchaseInquiryService;
-import com.uas.platform.b2b.service.PurchaseOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by dongbw
- * 18/03/18 11:34.
- */
-@RestController
-@RequestMapping("/batch/covertouser")
-public class ProductUserBatchController {
-
-    @Autowired
-    private PurchaseInquiryService purchaseInquiryService;
-
-    @Autowired
-    private PurchaseOrderService purchaseOrderService;
-
-    /**
-     * 根据企业UU批量处理询价单明细中的物料转入供应商报价人个人物料
-     * @param enUU 采购方企业UU
-     */
-    @RequestMapping(value = "/inquiryItem", method = RequestMethod.GET)
-    public void coverInquiryItemProdToUser (Long enUU) throws Exception {
-        //TODO 添加不需要enUU的处理
-        System.out.println("进入接口");
-        purchaseInquiryService.coverInquiryItemProdToUser(enUU);
-    }
-
-    /**
-     * 根据企业UU批量处理采购单中的物料转入供应商报价人个人物料
-     * @param enUU 采购方企业UU
-     */
-    @RequestMapping(value = "/purchaseOrder", method = RequestMethod.GET)
-    public void coverPurchaseOrderItemProdToUser (Long enUU) throws Exception {
-        //TODO 添加不需要enUU的处理
-        System.out.println("进入接口");
-        purchaseOrderService.coverPurchaseOrderItemProdToUser(enUU);
-    }
-}

src/main/java/com/uas/platform/b2b/dao/AddPartnerDao.java

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.AddPartner;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.AddPartner;
+import java.util.List;
 
 @Repository
 public interface AddPartnerDao extends JpaRepository<AddPartner, Long>, JpaSpecificationExecutor<AddPartner> {
@@ -46,6 +45,5 @@ public interface AddPartnerDao extends JpaRepository<AddPartner, Long>, JpaSpeci
 	 * @return
 	 */
 	@Query("select count(o) from AddPartner o where o.supplieruu = :supplieruu and o.applyStatuscode = :applyStatuscode")
-	public int getTodoCountBySupplieruuAndApplyStatuscode(@Param("supplieruu") long supplieruu,
-			@Param("applyStatuscode") int applyStatuscode);
+	public int getTodoCountBySupplieruuAndApplyStatuscode(@Param("supplieruu") long supplieruu, @Param("applyStatuscode") int applyStatuscode);
 }

src/main/java/com/uas/platform/b2b/dao/MallAdministratorsDao.java

@@ -1,28 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.MallAdministrators;
-
-/**
- * 商城管理员权限表
- * 
- * @author hejq
- * @time 创建时间：2017年6月27日
- */
-@Repository
-public interface MallAdministratorsDao
-		extends JpaRepository<MallAdministrators, Long>, JpaSpecificationExecutor<MallAdministrators> {
-
-	/**
-	 * 通过企业uu查询是否有设置商城管理员的权限
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	List<MallAdministrators> findByAdenuu(Long enuu);
-}

src/main/java/com/uas/platform/b2b/dao/ProductTempDao.java

@@ -56,7 +56,7 @@ public class ProductTempDao {
 
     public void matchExists(String importId) {
         jdbcTemplate.update("Merge Into (Select * From Products_Temp Where Pr_Import_Id=? And Pr_Exist_Id Is Null) T " +
-                "Using Products P On ((T.pr_code = P.pr_code Or (T.Pr_Title=P.Pr_Title And T.Pr_Cmpcode=P.Pr_Cmpcode And T.Pr_Brand=P.Pr_Brand And T.Pr_Spec=P.Pr_Spec And nvl(P.pr_standard, 0) <> 1) " +
+                "Using Products P On ((T.pr_code = P.pr_code Or (T.Pr_Title=P.Pr_Title And T.Pr_Cmpcode=P.Pr_Cmpcode And T.Pr_Brand=P.Pr_Brand And T.Pr_Spec=P.Pr_Spec And ifnull(P.pr_standard, 0) <> 1) " +
                 "Or (T.Pr_Title=P.Pr_Kind And T.Pr_Cmpcode=P.Pr_Pcmpcode And T.Pr_Brand=P.Pr_Pbrand  And P.pr_standard = 1)) " +
                 "and t.pr_enuu=p.pr_enuu) when matched then update set t.pr_exist_id=p.pr_id", importId);
     }
@@ -134,7 +134,7 @@ public class ProductTempDao {
 
     public List<ProductUsers> getNotMatchedProductUsers(final String importId, final long enUU, final long userUU, List<Long> ids) {
         // 使用临时表productusers_temp方便操作
-        jdbcTemplate.batchUpdate("insert into productusers_temp(pu_import_id,pu_date,pu_enuu,pu_useruu,pu_prid) values (?,sysdate,?,?,?)",
+        jdbcTemplate.batchUpdate("insert into productusers_temp(pu_import_id,pu_date,pu_enuu,pu_useruu,pu_prid) values (?,now(),?,?,?)",
                 ids, ids.size(), new ParameterizedPreparedStatementSetter<Long>() {
                     @Override
                     public void setValues(PreparedStatement ps, Long id) throws SQLException {

src/main/java/com/uas/platform/b2b/dao/PublicInquiryItemInfoDao.java

@@ -34,6 +34,6 @@ public interface PublicInquiryItemInfoDao extends JpaRepository<PublicInquiryIte
      * @param backStatus 下载状态：202未下载；203已下载；351下载中
      * @return
      */
-    @Query("from PublicInquiryItemInfo d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and nvl(d.sourceApp, ' ') <> 'B2B'")
+    @Query("from PublicInquiryItemInfo d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and ifnull(d.sourceApp, ' ') <> 'B2B'")
     List<PublicInquiryItemInfo> findByEnUUAndBackStatus(@Param("enUU") Long enUU, @Param("backStatus") short backStatus);
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryItemDao.java

@@ -43,7 +43,7 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 * @param backStatus
 	 * @return
 	 */
-	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and nvl(d.sourceApp, ' ') <> 'B2B'")
+	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and IFNULL(d.sourceApp, ' ') <> 'B2B'")
 	List<PurchaseInquiryItem> findByEnUUAndBackStatus(@Param("enUU") long enUU, @Param("backStatus") short backStatus);
 
 	/**

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderDao.java

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseOrder;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseOrder;
+import java.util.List;
 
 @Repository
 public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder>, JpaRepository<PurchaseOrder, Long> {
@@ -66,7 +65,7 @@ public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder
 	 * @param ids 需要筛选的id号集合
 	 * @return 已回复单据id号集合
 	 */
-	@Query("select p.id from PurchaseOrderAll p where p.id in :ids and p.status=201 and nvl(p.end,0)=0")
+	@Query("select p.id from PurchaseOrderAll p where p.id in :ids and p.status=201 and IFNULL(p.end,0)=0")
 	List<Long> findRepliedId(@Param("ids") List<Long> ids);
 
     /**
@@ -75,6 +74,6 @@ public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder
      * @param ids 需要筛选的id号集合
      * @return 未回复单据id号集合
      */
-	@Query("select p.id from PurchaseOrderAll p where p.id in :ids and p.status=200 and nvl(p.end,0)=0")
+	@Query("select p.id from PurchaseOrderAll p where p.id in :ids and p.status=200 and IFNULL(p.end,0)=0")
 	List<Long> findNotReplyId(@Param("ids") List<Long> ids);
 }

src/main/java/com/uas/platform/b2b/dao/RoleDao.java

@@ -68,7 +68,7 @@ public interface RoleDao extends JpaRepository<Role, Long> {
 	 * @param desc
 	 * @return
 	 */
-	@Query(value = "select * from sec$roles r where r.role_desc = :description and r.isdefault = 1 and r.role_enuu is null and rownum <= 1",nativeQuery = true)
+	@Query(value = "select * from sec$roles r where r.role_desc = :description and r.isdefault = 1 and r.role_enuu is null and limit 1", nativeQuery = true)
     Role findDefaultRoleByDesc(@Param("description")String desc);
 
 	/**
@@ -77,6 +77,6 @@ public interface RoleDao extends JpaRepository<Role, Long> {
 	 * @param enUU
 	 * @return
 	 */
-	@Query(value = "select nvl(max(role_index), 0) from sec$roles where role_enuu = :enUU", nativeQuery = true)
+	@Query(value = "select IFNULL(max(role_index), 0) from sec$roles where role_enuu = :enUU", nativeQuery = true)
 	Long findIndexByEnUU(@Param("enUU") Long enUU);
 }

src/main/java/com/uas/platform/b2b/dao/SaleSendItemDao.java

@@ -48,7 +48,8 @@ public interface SaleSendItemDao extends JpaSpecificationExecutor<SaleSendItem>,
 	 * @param verifyQty
 	 */
 	@Modifying(clearAutomatically = true)
-	@Query(nativeQuery = true, value = "update sale$senditem si set (si_verifyqty, si_okqty, si_notokqty) = (select sum(siv_qty), sum(siv_okqty), sum(siv_notokqty) from SALE$SENDITEMVERIFY siv where siv.SIV_SENDITEMID = si.SI_ID ) where si.si_id= :id")
+	@Query(nativeQuery = true,
+		value = "update sale$senditem si set si_verifyqty = (select sum(siv_qty) from SALE$SENDITEMVERIFY siv where siv.SIV_SENDITEMID = si.SI_ID ), si_okqty = (select sum(siv_okqty) from SALE$SENDITEMVERIFY siv where siv.SIV_SENDITEMID = si.SI_ID ), si_notokqty = (select sum(siv_notokqty) from SALE$SENDITEMVERIFY siv where siv.SIV_SENDITEMID = si.SI_ID ) where si.si_id= :id")
 	public void updateByVerify(@Param("id") long id);
 	
 	/**

src/main/java/com/uas/platform/b2b/erp/model/ErpLog.java

@@ -41,8 +41,7 @@ public class ErpLog extends BufferedLogable implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$erp_gen")
-	@SequenceGenerator(name = "log$erp_gen", sequenceName = "log$erp_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "log_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/erp/model/PurchaseTenderErp.java

@@ -15,15 +15,9 @@ import java.util.Set;
 
 @Table(name = "v$purc$tender")
 @Entity
-public class PurchaseTenderErp implements Serializable {
-    /**
-     * 序列号
-     */
-    private static final long serialVersionUID = 1L;
+public class PurchaseTenderErp {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$tender_gen")
-    @SequenceGenerator(name = "purc$tender_gen", sequenceName = "purc$tender_seq", allocationSize = 1)
     @Column(name = "pt_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/erp/model/SaleTenderErp.java

@@ -23,8 +23,7 @@ public class SaleTenderErp implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$tender_gen")
-    @SequenceGenerator(name = "sale$tender_gen", sequenceName = "sale$tender_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "st_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/erp/model/SaleTenderItemErp.java

@@ -18,8 +18,7 @@ public class SaleTenderItemErp implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$tenderitem_gen")
-    @SequenceGenerator(name = "sale$tenderitem_gen", sequenceName = "sale$tenderitem_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "sti_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/erp/model/SaleTenderProdErp.java

@@ -29,8 +29,7 @@ public class SaleTenderProdErp implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$tenderprod_gen")
-    @SequenceGenerator(name = "purc$tenderprod_gen", sequenceName = "purc$tenderprod_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "tp_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldInvalidReleaseEvent.java

@@ -45,7 +45,7 @@ public class PurchaseInquiryMouldInvalidReleaseEvent extends SaveReleaseEvent<Pa
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
         String category = "sale";  // 对接收方来说，该单据类型
-        String table = "v$purc$inquiry_mould";
+        String table = "v$purc$inquirymould";
         Long sourceId = mould.getId();
         String url = "#/sale/mould/" + mould.getId();
         Short orderStatus = mould.getStatus();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldReplyReleaseEvent.java

@@ -47,7 +47,7 @@ public class PurchaseInquiryMouldReplyReleaseEvent extends SaveReleaseEvent<Pagi
         String enName = mould.getEnterprise().getEnName();
         Short isReply = Constant.YES;
         String category = "purc";
-        String table = "v$purc$inquiry_mould";
+        String table = "v$purc$inquirymould";
         Long sourceId = mould.getId();
         // 根据状态判断是修改报价，还是第一次回复报价
         Short orderStatus = mould.getStatus();

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldSaveReleaseEvent.java

@@ -45,7 +45,7 @@ public class PurchaseInquiryMouldSaveReleaseEvent extends SaveReleaseEvent<Pagin
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
         String category = "sale";  // 对接收方来说，该单据类型
-        String table = "v$purc$inquiry_mould";
+        String table = "v$purc$inquirymould";
         Long sourceId = mould.getId();
         String url = "#/sale/mould/" + mould.getId();
         Short orderStatus = mould.getStatus();

src/main/java/com/uas/platform/b2b/mobile/model/AdvancedSettings.java

@@ -1,15 +1,8 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 高级设置
  * 
@@ -29,8 +22,7 @@ public class AdvancedSettings implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$advancedsettings_gen")
-	@SequenceGenerator(name = "mobile$advancedsettings_gen", sequenceName = "mobile$advancedsettings_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "adv_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/mobile/model/AppFlowOperation.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 对审批流进行操作
  * 
@@ -30,8 +23,7 @@ public class AppFlowOperation implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$flowoperation_gen")
-	@SequenceGenerator(name = "mobile$flowoperation_gen", sequenceName = "mobile$flowoperation_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fop_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/mobile/model/ApprovalLog.java

@@ -17,8 +17,7 @@ public class ApprovalLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$applog_gen")
-	@SequenceGenerator(name = "office$applog_gen", sequenceName = "office$applog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "log_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/BulletinCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 公告中心
  * 
@@ -30,8 +23,7 @@ public class BulletinCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$bulletincenter_gen")
-	@SequenceGenerator(name = "mobile$bulletincenter_gen", sequenceName = "mobile$bulletincenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "bul_id")
 	private Long no_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/ClockAddress.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 打卡地点设置
  * 
@@ -30,8 +23,7 @@ public class ClockAddress implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$clockaddress_gen")
-	@SequenceGenerator(name = "mobile$clockaddress_gen", sequenceName = "mobile$clockaddress_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "cla_id")
 	private Long cs_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/ClockSetCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 打卡设置中心
  * 
@@ -30,8 +23,7 @@ public class ClockSetCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$clocksetcenter_gen")
-	@SequenceGenerator(name = "mobile$clocksetcenter_gen", sequenceName = "mobile$clocksetcenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "clo_id")
 	private Long wd_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 出差单
  * 
@@ -35,8 +24,7 @@ public class FeePlease implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$feeplease_gen")
-	@SequenceGenerator(name = "mobile$feeplease_gen", sequenceName = "mobile$feeplease_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fp_id")
 	private Long fp_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/FeePleaseDetail.java

@@ -1,21 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+
 /**
  * 出差明细
  * 
@@ -35,8 +25,7 @@ public class FeePleaseDetail implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$feepleasedetail_gen")
-	@SequenceGenerator(name = "mobile$feepleasedetail_gen", sequenceName = "mobile$feepleasedetail_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fpd_id")
 	private Long fpd_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/MobileAuditLog.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 单据操作日志
  * 
@@ -30,8 +23,7 @@ public class MobileAuditLog implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$auditLog_gen")
-	@SequenceGenerator(name = "mobile$auditLog_gen", sequenceName = "mobile$auditLog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ad_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/NewsCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 新闻中心
  * 
@@ -30,8 +23,7 @@ public class NewsCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$newscenter_gen")
-	@SequenceGenerator(name = "mobile$newscenter_gen", sequenceName = "mobile$newscenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "news_id")
 	private Long ne_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/NoticeCenter.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 通知中心
  * 
@@ -30,8 +23,7 @@ public class NoticeCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$noticecenter_gen")
-	@SequenceGenerator(name = "mobile$noticecenter_gen", sequenceName = "mobile$noticecenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "not_id")
 	private Long no_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/OutAddress.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 外勤常用地址
  * 
@@ -27,8 +20,7 @@ public class OutAddress implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outaddress_gen")
-	@SequenceGenerator(name = "mobile$outaddress_gen", sequenceName = "mobile$outaddress_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "oad_id")
 	private Long md_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/OutPlan.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 外勤设置
  * 
@@ -32,8 +21,7 @@ public class OutPlan implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outplan_gen")
-	@SequenceGenerator(name = "mobile$outplan_gen", sequenceName = "mobile$outplan_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "op_id")
 	private Long mp_id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/OutPlanDetail.java

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 外勤详细表
  * 
@@ -36,8 +26,7 @@ public class OutPlanDetail implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outplandetail_gen")
-	@SequenceGenerator(name = "mobile$outplandetail_gen", sequenceName = "mobile$outplandetail_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "opd_id")
 	private Long mpd_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/OutSet.java

@@ -1,15 +1,8 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 外勤参数
  * 
@@ -26,8 +19,7 @@ public class OutSet implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outset_gen")
-	@SequenceGenerator(name = "mobile$outset_gen", sequenceName = "mobile$outset_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "out_id")
 	private Long mo_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 外勤签到记录表
  * 
@@ -27,8 +20,7 @@ public class OutSign implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outsign_gen")
-	@SequenceGenerator(name = "mobile$outsign_gen",sequenceName = "mobile$outsign_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "sign_id")
 	private Long mo_id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/SignApp.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 补卡申诉
  * 
@@ -30,8 +23,7 @@ public class SignApp implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signapp_gen")
-	@SequenceGenerator(name = "mobile$signapp_gen", sequenceName = "mobile$signapp_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ms_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/mobile/model/SignCard.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 打卡记录
  * 
@@ -30,8 +23,7 @@ public class SignCard implements Serializable, Comparable<SignCard> {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signcard_gen")
-	@SequenceGenerator(name = "mobile$signcard_gen", sequenceName = "mobile$signcard_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "sig_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/SignCardLog.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 员工打卡记录
  * 
@@ -30,8 +23,7 @@ public class SignCardLog implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signcardlog_gen")
-	@SequenceGenerator(name = "mobile$signcardlog_gen", sequenceName = "mobile$signcardlog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "sgl_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java

@@ -1,15 +1,8 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 用户中心
  * 
@@ -29,8 +22,7 @@ public class UserCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$usercenter_gen")
-	@SequenceGenerator(name = "mobile$usercenter_gen", sequenceName = "mobile$usercenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "user_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 请假单
  * 
@@ -30,8 +23,7 @@ public class Vacation implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$vacation_gen")
-	@SequenceGenerator(name = "mobile$vacation_gen", sequenceName = "mobile$vacation_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "va_id")
 	private Long va_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/VisitRecord.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
+import org.hibernate.validator.constraints.Length;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.hibernate.validator.constraints.Length;
-
 /**
  * 拜访记录表
  * 
@@ -32,8 +25,7 @@ public class VisitRecord implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$visitRecord_gen")
-	@SequenceGenerator(name = "mobile$visitRecord_gen", sequenceName = "mobile$visitRecord_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "vr_id")
 	private Long vr_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
+import org.hibernate.validator.constraints.Length;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.hibernate.validator.constraints.Length;
-
 /**
  * 工作日报
  * 
@@ -32,8 +25,7 @@ public class WorkDaily implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workdaily_gen")
-	@SequenceGenerator(name = "mobile$workdaily_gen", sequenceName = "mobile$workdaily_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wd_id")
 	private Long wd_id;
 

src/main/java/com/uas/platform/b2b/mobile/model/WorkData.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 设置员工班次表
  * 
@@ -30,8 +23,7 @@ public class WorkData implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workdata_gen")
-	@SequenceGenerator(name = "mobile$workdata_gen", sequenceName = "mobile$workdata_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wd_id")
 	private Long wd_id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertime.java

@@ -1,21 +1,10 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 加班申请单
  * 
@@ -35,8 +24,7 @@ public class WorkOvertime implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workovertime_gen")
-	@SequenceGenerator(name = "mobile$workovertime_gen", sequenceName = "mobile$workovertime_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wo_id")
 	private Long wo_id;
 	

src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertimeDet.java

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 加班申请详情
  * 
@@ -36,8 +26,7 @@ public class WorkOvertimeDet implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workovertimedet_gen")
-	@SequenceGenerator(name = "mobile$workovertimedet_gen", sequenceName = "mobile$workovertimedet_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wod_id")
 	private Long wod_id;
 

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileTaskServiceImpl.java

@@ -118,18 +118,18 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 		Integer processcount = commonDao.queryForObject(todo, Integer.class);
 		Integer taskcount = commonDao.queryForObject(doing, Integer.class);
 		List<OfficeTask> lasttask = commonDao.query(
-				"select * from ( select t.ta_taskname taskname, t.ta_startdate startdate from office$task t where t.ta_statuscode = 'start' and t.ta_domancode = '"
-						+ emcode + "' and t.ta_uu = " + enuu + " order by t.ta_id desc ) where rownum < 2",
+				"select t.ta_taskname taskname, t.ta_startdate startdate from office$task t where t.ta_statuscode = 'start' and t.ta_domancode = '"
+						+ emcode + "' and t.ta_uu = " + enuu + " order by t.ta_id desc limit 1",
 				OfficeTask.class);
 		List<AppFlowOperation> nowProcess = commonDao.query(
-				"select * from ( select t.fop_caller caller, t.fop_dealname dealname, t.fop_dealtime dealtime,t.fop_nodelevel nodelevel,t.fop_sourceid sourceid from mobile$flowoperation t where t.fop_statuscode = 'UNAUDIT' and t.fop_nodedealuu = "
-						+ emcode + " and t.fop_nodeenuu = " + enuu + " order by t.fop_id desc ) where rownum < 2",
+				"select t.fop_caller caller, t.fop_dealname dealname, t.fop_dealtime dealtime,t.fop_nodelevel nodelevel,t.fop_sourceid sourceid from mobile$flowoperation t where t.fop_statuscode = 'UNAUDIT' and t.fop_nodedealuu = "
+						+ emcode + " and t.fop_nodeenuu = " + enuu + " order by t.fop_id desc limit 1",
 				AppFlowOperation.class);
 		if (!CollectionUtils.isEmpty(nowProcess)) {
 			List<AppFlowOperation> lastProcess = commonDao
 					.query("select * from( select t.fop_caller caller, t.fop_dealname dealname, t.fop_dealtime dealtime from mobile$flowoperation t where t.fop_nodeenuu = "
 							+ enuu + " and t.fop_nodelevel = " + (nowProcess.get(0).getNodelevel() - 1)
-							+ " and t.fop_sourceid = " + nowProcess.get(0).getSourceid() + ")", AppFlowOperation.class);
+							+ " and t.fop_sourceid = " + nowProcess.get(0).getSourceid() + ") a", AppFlowOperation.class);
 			if (!CollectionUtils.isEmpty(lastProcess)) {
 				map.put("lastProcessTime", lastProcess.get(0).getDealtime());
 				if (nowProcess.get(0).getDealname() != null) {

src/main/java/com/uas/platform/b2b/mobile/service/impl/OutPlanServiceImpl.java

@@ -74,7 +74,7 @@ public class OutPlanServiceImpl implements OutPlanService {
 			String detailSql = "select p.opd_id mpd_id, p.opd_code mpd_code, p.opd_recordercode mpd_recordercode, p.opd_recorder mpd_recorder, p.opd_address mpd_address,"
 					+ "p.opd_kind mpd_kind, p.opd_detno mpd_detno, p.opd_remark mpd_remark, p.opd_location mpd_location, p.opd_enuu mpd_enuu, p.opd_arrivedate mpd_arrivedate,"
 					+ "p.opd_actdate mpd_actdate, p.opd_outdate mpd_outdate, p.opd_recorddate mpd_recorddate, p.opd_status mpd_status, p.opd_statuscode mpd_statuscode, p.opd_longitude longitude,p.opd_latitude latitude, p.opd_distance mpd_distance, p.opd_company mpd_company, p.opd_firsttime mpd_firsttime, p.opd_lasttime mpd_lasttime from mobile$outplandetail p where opd_opid = ?"
-					+ " and opd_arrivedate>=to_char(sysdate) and opd_arrivedate<to_char(sysdate+1) order by opd_id desc";
+					+ " and opd_arrivedate>=now() and opd_arrivedate<adddate(now(), interval 1 day) order by opd_id desc";
 			List<OutPlanDetail> details = commonDao.query(detailSql, OutPlanDetail.class, outPlan.getMp_id());
 			for (OutPlanDetail detail : details) {
 				String addSql = "select p.oad_longitude md_longitude, p.oad_latitude md_latitude from mobile$outaddress p where oad_address = '"

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkScheduleServiceImpl.java

@@ -58,7 +58,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 					+ "d.opd_actdate mpd_actdate, d.opd_outdate mpd_outdate, d.opd_recorddate mpd_recorddate, d.opd_status mpd_status, d.opd_statuscode mpd_statuscode, "
 					+ "d.opd_distance mpd_distance, d.opd_longitude mpd_longitude, d.opd_latitude mpd_latitude, d.opd_company mpd_company, d.opd_firsttime mpd_firsttime, "
 					+ "d.opd_lasttime mpd_lasttime from mobile$outplandetail d where d.opd_opid = o.op_id and o.op_enuu = "
-					+ enuu + " and o.op_recordercode = " + emcode + " and to_char(d.opd_arrivedate,'yyyymm') = '" + date
+					+ enuu + " and o.op_recordercode = " + emcode + " and date_format(d.opd_arrivedate,'%Y%m') = '" + date
 					+ "')";
 			List<OutPlan> meOutPlans = commonDao.query(sql, OutPlan.class);
 			List<OutPlanInfo> planInfos = new ArrayList<OutPlanInfo>();
@@ -92,13 +92,13 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 					+ "t.ta_doman doman, t.ta_domancode domancode, t.ta_startdate startdate, t.ta_enddate enddate, t.ta_status status, "
 					+ "t.ta_statuscode statuscode, t.ta_recorddate recorddate, t.ta_uu uu, t.ta_taskname taskname  from office$task t where "
 					+ "ta_uu = " + enuu + " and ta_domancode = " + emcode
-					+ " and  to_char(ta_startdate,'yyyymm') = '" + date + "'";
+					+ " and  date_format(ta_startdate,'%Y%m') = '" + date + "'";
 			// 录入人是自己而且是待确认的
 			String metaskSql = "select t.ta_id id, t.ta_code code, t.ta_detail detail, t.ta_recordercode recordercode, t.ta_recorder recorder, "
 					+ "t.ta_doman doman, t.ta_domancode domancode, t.ta_startdate startdate, t.ta_enddate enddate, t.ta_status status, "
 					+ "t.ta_statuscode statuscode, t.ta_recorddate recorddate, t.ta_uu uu, t.ta_taskname taskname  from office$task t where "
-					+ "ta_uu = " + enuu + " and ta_recordercode = " + emcode + "and ta_domancode <>" + emcode
-					+ " and ta_status = '待确认'" + " and  to_char(ta_startdate,'yyyymm') = '" + date + "'";
+					+ "ta_uu = " + enuu + " and ta_recordercode = " + emcode + " and ta_domancode <>" + emcode
+					+ " and ta_status = '待确认'" + " and  date_format(ta_startdate,'%Y%m') = '" + date + "'";
 			List<OfficeTask> task = commonDao.query(taskSql, OfficeTask.class);
 			List<OfficeTask> meTask = commonDao.query(metaskSql, OfficeTask.class);
 			task.addAll(meTask);
@@ -117,7 +117,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 						+ "d.opd_actdate mpd_actdate, d.opd_outdate mpd_outdate, d.opd_recorddate mpd_recorddate, d.opd_status mpd_status, d.opd_statuscode mpd_statuscode, "
 						+ "d.opd_distance mpd_distance, d.opd_longitude mpd_longitude, d.opd_latitude mpd_latitude, d.opd_company mpd_company, d.opd_firsttime mpd_firsttime, "
 						+ "d.opd_lasttime mpd_lasttime from mobile$outplandetail d where d.opd_opid = o.op_id and o.op_enuu = "
-						+ enuu + " and to_char(d.opd_arrivedate,'yyyymm') = '" + date + "')";
+						+ enuu + " and date_format(d.opd_arrivedate,'%Y%m') = '" + date + "')";
 				List<OutPlan> outPlans = commonDao.query(outsql, OutPlan.class);
 				List<OutPlanInfo> othOutPlans = new ArrayList<OutPlanInfo>();
 				if (!CollectionUtils.isEmpty(outPlans)) {
@@ -150,7 +150,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 				String othtaSql = "select o.ta_id id, o.ta_code code, o.ta_detail detail, o.ta_recordercode recordercode, "
 						+ "o.ta_recorder recorder, o.ta_doman doman, o.ta_domancode domancode, o.ta_startdate startdate, "
 						+ "o.ta_enddate enddate,o.ta_status status, o.ta_recorddate recorddate,o.ta_uu uu, o.ta_taskname taskname from office$task o where o.ta_uu = "
-						+ enuu + " and to_char(ta_startdate,'yyyymm') = '" + date + "'";
+						+ enuu + " and date_format(ta_startdate,'%Y%m') = '" + date + "'";
 				List<OfficeTask> tasks = commonDao.query(othtaSql, OfficeTask.class);
 				List<OfficeTask> othTasks = new ArrayList<OfficeTask>();
 				if (!CollectionUtils.isEmpty(tasks)) {
@@ -203,9 +203,9 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 	public List<VisitRecord> getRecordsInOneMonth(Long emuu, Long enuu, String date) {
 		String sql = "select p.vr_detail vr_detail, p.vr_emname vr_emname, p.vr_id vr_id, p.vr_startdate vr_startdate, p.vr_cuaddress vr_cuaddress, "
 				+ "p.vr_title vr_title, p.vr_enddate vr_enddate, p.vr_cucontact vr_cucontact, p.vr_cuname vr_cuname, p.vr_date vr_date from mobile$visitrecord p where "
-				+ "vr_emuu = " + emuu + " and vr_enuu = " + enuu + "and (to_char(vr_startdate,'yyyymm') = '" + date
-				+ "' or ( vr_startdate is null and to_char(vr_enddate,'yyyymm') = '" + date
-				+ "') or (vr_startdate is null and vr_enddate is null and to_char(vr_date,'yyyymm') = '" + date + "'))";
+				+ "vr_emuu = " + emuu + " and vr_enuu = " + enuu + " and (date_format(vr_startdate,'%Y%m') = '" + date
+				+ "' or ( vr_startdate is null and date_format(vr_enddate,'%Y%m') = '" + date
+				+ "') or (vr_startdate is null and vr_enddate is null and date_format(vr_date,'%Y%m') = '" + date + "'))";
 		List<VisitRecord> records = commonDao.query(sql, VisitRecord.class);
 		return records;
 	}
@@ -214,9 +214,9 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 	public List<VisitRecord> getRecordsInOneMonth(Long enuu, String date) {
 		String sql = "select p.vr_detail vr_detail, p.vr_emname vr_emname, p.vr_id vr_id, p.vr_startdate vr_startdate, p.vr_cuaddress vr_cuaddress, "
 				+ "p.vr_title vr_title, p.vr_enddate vr_enddate, p.vr_cucontact vr_cucontact, p.vr_cuname vr_cuname,  p.vr_date vr_date  from mobile$visitrecord p where "
-				+ "vr_enuu = " + enuu + "and (to_char(vr_startdate,'yyyymm') = '" + date
-				+ "' or ( vr_startdate is null and to_char(vr_enddate,'yyyymm') = '" + date
-				+ "') or (vr_startdate is null and vr_enddate is null and to_char(vr_date,'yyyymm') = '" + date + "'))";
+				+ "vr_enuu = " + enuu + "and (date_format(vr_startdate,'%Y%m') = '" + date
+				+ "' or ( vr_startdate is null and date_format(vr_enddate,'%Y%m') = '" + date
+				+ "') or (vr_startdate is null and vr_enddate is null and date_format(vr_date,'%Y%m') = '" + date + "'))";
 		List<VisitRecord> records = commonDao.query(sql, VisitRecord.class);
 		return records;
 	}

src/main/java/com/uas/platform/b2b/model/AddPartner.java

@@ -27,8 +27,7 @@ public class AddPartner implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$addpartner_gen")
-	@SequenceGenerator(name = "purc$addpartner_gen", sequenceName = "purc$addpartner_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ap_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/ApbillAdjustment.java

@@ -36,8 +36,7 @@ public class ApbillAdjustment implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$apbilladjustment_gen")
-	@SequenceGenerator(name = "purc$apbilladjustment_gen", sequenceName = "purc$apbilladjustment_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "aa_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/ApprovalFlow.java

@@ -35,8 +35,7 @@ public class ApprovalFlow implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$approvalflow_gen")
-	@SequenceGenerator(name = "office$approvalflow_gen", sequenceName = "office$approvalflow_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "app_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/Attach.java

@@ -26,8 +26,7 @@ public class Attach implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "attachs_gen")
-	@SequenceGenerator(name = "attachs_gen", sequenceName = "attachs_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "at_id")
 	private Long id;
 	/**

src/main/java/com/uas/platform/b2b/model/B2bCodeSet.java

@@ -20,8 +20,7 @@ public class B2bCodeSet implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "b2b$CodeSet_gen")
-	@SequenceGenerator(name = "b2b$CodeSet_gen", sequenceName = "b2b$CodeSet_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "bc_id")
 	private Long id;
 	
@@ -76,7 +75,7 @@ public class B2bCodeSet implements Serializable{
 	@Column(name = "bc_prtypepreix")
 	private String prtypepreix;
 	
-	@Column(name = "bc_fromerp")
+	@Column(name = "bc_fromerp", nullable = false)
 	private String fromerp;
 	
 	@Column(name = "bc_fromplat")

src/main/java/com/uas/platform/b2b/model/BarLabel.java

@@ -28,8 +28,7 @@ public class BarLabel implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$label_gen")
-	@SequenceGenerator(name = "bar$label_gen", sequenceName = "bar$label_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "la_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/BarLabelParameter.java

@@ -23,8 +23,7 @@ public class BarLabelParameter implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$labelParameter_gen")
-	@SequenceGenerator(name = "bar$labelParameter_gen", sequenceName = "bar$labelParameter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "lp_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/BarLabelPrintSetting.java

@@ -30,8 +30,7 @@ public class BarLabelPrintSetting implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$labelprintsetting_gen")
-	@SequenceGenerator(name = "bar$labelprintsetting_gen", sequenceName = "bar$labelprintsetting_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "lps_id")
 	private Long id;
 	
@@ -45,7 +44,7 @@ public class BarLabelPrintSetting implements Serializable{
 	@Column(name = "lps_caller")
 	private String caller;
 	
-	@Column(name = "lps_sql")
+	@Column(name = "lps_sql", length = 1000)
 	private String sql;
 	
 	@Column(name = "lps_laname")

src/main/java/com/uas/platform/b2b/model/BarPackage.java

@@ -30,8 +30,7 @@ public class BarPackage implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$package_gen")
-	@SequenceGenerator(name = "bar$package_gen", sequenceName = "bar$package_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pa_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/BarPackageDetail.java

@@ -22,8 +22,7 @@ public class BarPackageDetail implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$packagedetail_gen")
-	@SequenceGenerator(name = "bar$packagedetail_gen", sequenceName = "bar$packagedetail_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pd_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/BarSendNotify.java

@@ -27,8 +27,7 @@ public class BarSendNotify implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$sendnotify_gen")
-	@SequenceGenerator(name = "bar$sendnotify_gen", sequenceName = "bar$sendnotify_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "bsn_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/ChangeAdmin.java

@@ -43,8 +43,7 @@ public class ChangeAdmin implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "changeadmin_gen")
-	@SequenceGenerator(name = "changeadmin_gen", sequenceName = "changeadmin_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "en_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/CommunalLog.java

@@ -24,8 +24,7 @@ public class CommunalLog extends BufferedLogable implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$common_gen")
-    @SequenceGenerator(name = "log$common_gen", sequenceName = "log$common_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "log_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/model/Customer.java

@@ -29,15 +29,14 @@ public class Customer implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$customers_gen")
-	@SequenceGenerator(name = "sale$customers_gen", sequenceName = "sale$customers_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "cu_id")
 	private Long id;
 
 	/**
 	 * 我的企业UU
 	 */
-	@Column(name = "cu_myenuu")
+	@Column(name = "cu_myenuu", nullable = false)
 	private Long myEnUU;
 
 	/**
@@ -51,14 +50,14 @@ public class Customer implements Serializable {
 	 * 客户企业UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cu_custenuu")
+	@JoinColumn(name = "cu_custenuu", nullable = false)
 	private Enterprise customerEnterprise;
 
 	/**
 	 * 客户联系人UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cu_custuseruu")
+	@JoinColumn(name = "cu_custuseruu", nullable = false)
 	@OtherUserUU
 	private UserBaseInfo customerUser;
 

src/main/java/com/uas/platform/b2b/model/DeOrderDeleteLog.java

@@ -27,8 +27,7 @@ public class DeOrderDeleteLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deorderdeletelog_gen")
-	@SequenceGenerator(name = "purc$deorderdeletelog_gen", sequenceName = "purc$deorderdeletelog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "de_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/DefaultValue.java

@@ -21,8 +21,7 @@ public class DefaultValue implements Serializable {
      * 主键id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultvalue_gen")
-    @SequenceGenerator(name = "defaultvalue_gen", sequenceName = "defaultvalue_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "dv_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyDefaultValue.java

@@ -22,8 +22,7 @@ public class DeputyDefaultValue implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "deputy$defaultvalue_gen")
-	@SequenceGenerator(name = "deputy$defaultvalue_gen", sequenceName = "deputy$defaultvalue_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "de_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 代采企业设置
  * 
@@ -30,8 +23,7 @@ public class DeputyEnterprise implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyenterprise_gen")
-	@SequenceGenerator(name = "purc$deputyenterprise_gen", sequenceName = "purc$deputyenterprise_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "de_id")
 	private Long id;
 
@@ -47,14 +39,6 @@ public class DeputyEnterprise implements Serializable {
 	@Column(name = "de_deputyenuu")
 	private Long deputyenuu;
 	
-	// /**
-	// * 代采企业
-	// */
-	// @OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	// @JoinColumn(name = "de_deputyenuu", insertable = false, updatable =
-	// false)
-	// private Enterprise deputyEnterprise;
-
 	/**
 	 * 代采企业名称（和上面uu号无关，这个是名称传输，uu号是传到指定的账套）
 	 */
@@ -121,12 +105,4 @@ public class DeputyEnterprise implements Serializable {
 		this.deputyenname = deputyenname;
 	}
 
-	// public Enterprise getDeputyEnterprise() {
-	// return deputyEnterprise;
-	// }
-	//
-	// public void setDeputyEnterprise(Enterprise deputyEnterprise) {
-	// this.deputyEnterprise = deputyEnterprise;
-	// }
-
 }

src/main/java/com/uas/platform/b2b/model/DeputyHisVendors.java

@@ -30,8 +30,7 @@ public class DeputyHisVendors implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyhisvendors_gen")
-	@SequenceGenerator(name = "purc$deputyhisvendors_gen", sequenceName = "purc$deputyhisvendors_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dh_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/DeputyLastOrderKeywords.java

@@ -30,8 +30,7 @@ public class DeputyLastOrderKeywords implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputylastkeyword_gen")
-	@SequenceGenerator(name = "purc$deputylastkeyword_gen", sequenceName = "purc$deputylastkeyword_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dl_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyOrder.java

@@ -38,8 +38,7 @@ public class DeputyOrder implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyorders_gen")
-	@SequenceGenerator(name = "purc$deputyorders_gen", sequenceName = "purc$deputyorders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "deo_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyOrderItem.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -10,11 +11,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
 
 /**
  * 代采订单明细
@@ -35,8 +33,7 @@ public class DeputyOrderItem implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyorderitems_gen")
-	@SequenceGenerator(name = "purc$deputyorderitems_gen", sequenceName = "purc$deputyorderitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dei_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyOrderKeywords.java

@@ -30,8 +30,7 @@ public class DeputyOrderKeywords implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputykeywords_gen")
-	@SequenceGenerator(name = "purc$deputykeywords_gen", sequenceName = "purc$deputykeywords_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dk_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyOrdersLog.java

@@ -27,8 +27,7 @@ public class DeputyOrdersLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyorderslog_gen")
-	@SequenceGenerator(name = "purc$deputyorderslog_gen", sequenceName = "purc$deputyorderslog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "log_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/DeputyPaymentCompany.java

@@ -33,8 +33,7 @@ public class DeputyPaymentCompany implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputypaymentcompany_gen")
-	@SequenceGenerator(name = "purc$deputypaymentcompany_gen", sequenceName = "purc$deputypaymentcompany_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dpc_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/Distribute.java

@@ -27,8 +27,7 @@ public class Distribute implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$distribute_gen")
-	@SequenceGenerator(name = "purc$distribute_gen", sequenceName = "purc$distribute_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pd_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -30,8 +30,7 @@ public class Enterprise implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-//	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "enterprises_gen")
-//	@SequenceGenerator(name = "enterprises_gen", sequenceName = "enterprises_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "en_uu")
 	private Long uu;
 

src/main/java/com/uas/platform/b2b/model/FlowNode.java

@@ -1,21 +1,11 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.persistence.*;
+import java.io.Serializable;
+
 /**
  * 审核流程节点
  * 
@@ -26,14 +16,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 @Table(name = "office$flownode")
 public class FlowNode implements Serializable {
 
-	public String getEmname() {
-		return emname;
-	}
-
-	public void setEmname(String emname) {
-		this.emname = emname;
-	}
-
 	/**
 	 * 
 	 */
@@ -43,8 +25,7 @@ public class FlowNode implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$flownode_gen")
-	@SequenceGenerator(name = "office$flownode_gen", sequenceName = "office$flownode_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fn_id")
 	private Long id;
 	
@@ -242,5 +223,12 @@ public class FlowNode implements Serializable {
 		this.appname = appname;
 	}
 
+	public String getEmname() {
+		return emname;
+	}
+
+	public void setEmname(String emname) {
+		this.emname = emname;
+	}
 
 }

src/main/java/com/uas/platform/b2b/model/Growth.java

@@ -20,8 +20,7 @@ import javax.persistence.Table;
 public class Growth {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$growth_gen")
-	@SequenceGenerator(name = "log$growth_gen", sequenceName = "log$growth_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "grow_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/GrowthProcess.java

@@ -22,8 +22,7 @@ import javax.persistence.Table;
 public class GrowthProcess {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$growthprocess_gen")
-	@SequenceGenerator(name = "log$growthprocess_gen", sequenceName = "log$growthprocess_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "process_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/GuideSetting.java

@@ -22,8 +22,7 @@ public class GuideSetting implements Serializable {
      * id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$guidesetting_gen")
-    @SequenceGenerator(name = "sec$guidesetting_gen", sequenceName = "sec$guidesetting_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "gu_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/model/InvitationRecord.java

@@ -20,8 +20,7 @@ public class InvitationRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "invitationrecords_gen")
-	@SequenceGenerator(name = "invitationrecords_gen", sequenceName = "invitationrecords_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "in_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2b/model/MakeAccept.java

@@ -21,8 +21,7 @@ public class MakeAccept implements Serializable {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$accept_gen")
-	@SequenceGenerator(name = "make$accept_gen", sequenceName = "make$accept_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeAcceptItem.java

@@ -36,8 +36,7 @@ public class MakeAcceptItem {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$acceptitem_gen")
-	@SequenceGenerator(name = "make$acceptitem_gen", sequenceName = "make$acceptitem_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mai_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrder.java

@@ -1,26 +1,20 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 平台里面，以供应商的角度来查看委外加工单
  * 
  * @author suntg
  *
  */
-@Table(name = "make$orders")
+@Table(name = "make$orders", indexes = {
+		@Index(name = "make_order_code_index", columnList = "ma_code"),
+		@Index(name = "make_order_enuu_index", columnList = "ma_enuu"),
+		@Index(name = "make_order_code_enuu_index", columnList = "ma_code,ma_enuu", unique = true)
+})
 @Entity
 public class MakeOrder implements Serializable {
 
@@ -30,8 +24,7 @@ public class MakeOrder implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 
@@ -288,15 +281,6 @@ public class MakeOrder implements Serializable {
 		this.factory = factory;
 	}
 
-	// /**
-	// * 委外加工单用料明细
-	// */
-	// @OneToMany(mappedBy = "make", cascade = { CascadeType.REFRESH,
-	// CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch =
-	// FetchType.EAGER)
-	// @OrderBy("number")
-	// private Set<MakeOrderItem> items;
-
 	public Long getId() {
 		return id;
 	}
@@ -536,14 +520,6 @@ public class MakeOrder implements Serializable {
 	public void setEnd(Short end) {
 		this.end = end;
 	}
-	//
-	// public Set<MakeOrderItem> getItems() {
-	// return items;
-	// }
-	//
-	// public void setItems(Set<MakeOrderItem> items) {
-	// this.items = items;
-	// }
 
 	public Float getTaxrate() {
 		return taxrate;

src/main/java/com/uas/platform/b2b/model/MakeOrderChange.java

@@ -1,27 +1,13 @@
 package com.uas.platform.b2b.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
 /**
  * 委外变更单（主表，变更信息在明细表）
  * 
@@ -38,8 +24,7 @@ public class MakeOrderChange implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$changes_gen")
-	@SequenceGenerator(name = "make$changes_gen", sequenceName = "make$changes_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mc_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrderChangeItem.java

@@ -30,8 +30,7 @@ import com.uas.platform.core.model.Constant;
 public class MakeOrderChangeItem {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$changeitems_gen")
-	@SequenceGenerator(name = "make$changeitems_gen", sequenceName = "make$changeitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mcd_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrderDone.java

@@ -27,8 +27,7 @@ import org.hibernate.annotations.Where;
 public class MakeOrderDone {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrderEnd.java

@@ -27,8 +27,7 @@ import org.hibernate.annotations.Where;
 public class MakeOrderEnd  {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrderItem.java

@@ -1,27 +1,15 @@
 package com.uas.platform.b2b.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
 /**
  * 平台里面，以供应商的角度来查看委外加工单用料明细
  * 
@@ -38,8 +26,7 @@ public class MakeOrderItem implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orderitems_gen")
-	@SequenceGenerator(name = "make$orderitems_gen", sequenceName = "make$orderitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mai_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrderReply.java

@@ -1,24 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 
@@ -37,8 +25,7 @@ public class MakeOrderReply implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$reply_gen")
-	@SequenceGenerator(name = "make$reply_gen", sequenceName = "make$reply_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mr_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeOrderTodo.java

@@ -28,8 +28,7 @@ import org.hibernate.annotations.Where;
 public class MakeOrderTodo {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeReturn.java

@@ -1,28 +1,21 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 买家的委外验退单
  * 
  * @author aof
  * @date 2015年8月26日
  */
-@Table(name = "make$return")
+@Table(name = "make$return", indexes = {
+		@Index(name = "make_return_code_index", columnList = "mr_code"),
+		@Index(name = "make_return_enuu_index", columnList = "mr_enuu"),
+		@Index(name = "make_return_enuu_code_index", columnList = "mr_code,mr_enuu", unique = true)
+})
 @Entity
 public class MakeReturn implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -31,8 +24,7 @@ public class MakeReturn implements Serializable {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$return_gen")
-	@SequenceGenerator(name = "make$return_gen", sequenceName = "make$return_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mr_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MakeReturnItem.java

@@ -1,26 +1,10 @@
 package com.uas.platform.b2b.model;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.*;
 
 /**
  * 买家的委外验退单明细
@@ -36,8 +20,7 @@ public class MakeReturnItem {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$returnitem_gen")
-	@SequenceGenerator(name = "make$returnitem_gen", sequenceName = "make$returnitem_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mri_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/MallAdministrators.java

@@ -1,120 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "sec$malladministrators")
-public class MallAdministrators implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$malladministrators_gen")
-	@SequenceGenerator(name = "sec$malladministrators_gen", sequenceName = "sec$malladministrators_seq", allocationSize = 1)
-	@Column(name = "ma_id")
-	private Long id;
-
-	/**
-	 * 可以开通管理员权限的企业uu号
-	 */
-	@Column(name = "ma_adenuu")
-	private Long adenuu;
-
-	/**
-	 * 设置的企业uu号
-	 */
-	@Column(name = "ma_enuu")
-	private Long enuu;
-	
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_enuu", insertable = false, updatable = false)
-	private EnterpriseInfo enterprise;
-
-	/**
-	 * 设置人
-	 */
-	@Column(name = "ma_useruu")
-	private Long useruu;
-
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_useruu", insertable = false, updatable = false)
-	private UserBaseInfo userInfo;
-
-	/**
-	 * 时间
-	 */
-	@Column(name = "ma_date")
-	private Date date;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getAdenuu() {
-		return adenuu;
-	}
-
-	public void setAdenuu(Long adenuu) {
-		this.adenuu = adenuu;
-	}
-
-	public Long getEnuu() {
-		return enuu;
-	}
-
-	public void setEnuu(Long enuu) {
-		this.enuu = enuu;
-	}
-
-	public EnterpriseInfo getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(EnterpriseInfo enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public Long getUseruu() {
-		return useruu;
-	}
-
-	public void setUseruu(Long useruu) {
-		this.useruu = useruu;
-	}
-
-	public UserBaseInfo getUserInfo() {
-		return userInfo;
-	}
-
-	public void setUserInfo(UserBaseInfo userInfo) {
-		this.userInfo = userInfo;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-}

src/main/java/com/uas/platform/b2b/model/Message.java

@@ -1,16 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 平台官方推送给用户的消息
  * 
@@ -27,8 +20,7 @@ public class Message implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$messages_gen")
-	@SequenceGenerator(name = "info$messages_gen", sequenceName = "info$messages_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2b/model/NotExistProduct.java

@@ -24,8 +24,7 @@ public class NotExistProduct implements Serializable {
      * id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "erp$products_gen")
-    @SequenceGenerator(name = "erp$products_gen", sequenceName = "erp$products_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pr_id")
     private Long id;
 

src/main/java/com/uas/platform/b2b/model/Notice.java

@@ -20,8 +20,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 public class Notice {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$notices_gen")
-	@SequenceGenerator(name = "info$notices_gen", sequenceName = "info$notices_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "no_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/NoticeBody.java

@@ -22,8 +22,7 @@ import javax.persistence.Table;
 public class NoticeBody {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$noticesbody_gen")
-	@SequenceGenerator(name = "info$noticesbody_gen", sequenceName = "info$noticesbody_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "nb_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/OfficeTask.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.model;
 
+import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
-
 @Entity
 @Table(name = "office$task")
 public class OfficeTask implements Serializable {
@@ -27,8 +20,7 @@ public class OfficeTask implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$task_gen")
-	@SequenceGenerator(name = "office$task_gen", sequenceName = "office$task_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ta_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/OfficeTaskReply.java

@@ -24,8 +24,7 @@ public class OfficeTaskReply implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$taskreply_gen")
-	@SequenceGenerator(name = "office$taskreply_gen", sequenceName = "office$taskreply_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "tar_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2b/model/PagingRelease.java

@@ -27,8 +27,7 @@ public class PagingRelease implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$pagingrelease_gen")
-    @SequenceGenerator(name = "purc$pagingrelease_gen", sequenceName = "purc$pagingrelease_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pr_id")
     private Long id;
 
@@ -57,13 +56,6 @@ public class PagingRelease implements Serializable {
     @JoinColumn(name = "pr_enuu", insertable = false, updatable = false)
     private EnterpriseInfo enterprise;
 
-//    /**
-//     * 采购单所属采购员
-//     */
-//    @OneToOne(cascade = { CascadeType.REFRESH })
-//    @JoinColumn(name = "pr_emuu", insertable = false, updatable = false)
-//    private UserBaseInfo user;
-
     /**
      * 推送时间
      */

src/main/java/com/uas/platform/b2b/model/PagingReleaseCount.java

@@ -1,156 +1,155 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 未读消息统计表
- * Created by wangmh on 2017/7/7.
- */
-@Entity
-@Table(name = "purc$pagingreleasecount")
-public class PagingReleaseCount implements Serializable{
-
-    /**
-     * 序号
-     */
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$pagingreleasecount_gen")
-    @SequenceGenerator(name = "purc$pagingreleasecount_gen", sequenceName = "purc$pagingreleasecount_seq", allocationSize = 1)
-    @Column(name = "prc_id")
-    private Long id;
-
-    /**
-     * 用户UU号
-     */
-    @Column(name = "prc_useruu")
-    private Long userUU;
-
-    /**
-     * 用户
-     */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "prc_useruu", insertable = false, updatable = false)
-    private User user;
-
-    /**
-     * 企业UU号
-     */
-    @Column(name = "prc_enuu")
-    private Long enUU;
-
-    /**
-     * 企业
-     */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "prc_enuu", insertable = false, updatable = false)
-    private Enterprise enterprise;
-
-    /**
-     * 单据对应的表名（值小写）
-     */
-    @Column(name = "prc_table")
-    private String table;
-
-    /**
-     * 单据分类（sale or purc）
-     */
-    @Column(name = "prc_category")
-    private String category;
-
-    /**
-     * 消息数量
-     */
-    @Column(name = "prc_count")
-    private Integer count;
-
-    /**
-     * 统计单据状态（-1为统计全部单据）
-     */
-    @Column(name = "prc_orderstatus")
-    private Integer orderStatus;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Enterprise getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(Enterprise enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public void setTable(String table) {
-        this.table = table;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    public Long getUserUU() {
-        return userUU;
-    }
-
-    public void setUserUU(Long userUU) {
-        this.userUU = userUU;
-    }
-
-    public Long getEnUU() {
-        return enUU;
-    }
-
-    public void setEnUU(Long enUU) {
-        this.enUU = enUU;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-}
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+/**
+ * 未读消息统计表
+ * Created by wangmh on 2017/7/7.
+ */
+@Entity
+@Table(name = "purc$pagingreleasecount")
+public class PagingReleaseCount implements Serializable{
+
+    /**
+     * 序号
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "prc_id")
+    private Long id;
+
+    /**
+     * 用户UU号
+     */
+    @Column(name = "prc_useruu")
+    private Long userUU;
+
+    /**
+     * 用户
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH })
+    @JoinColumn(name = "prc_useruu", insertable = false, updatable = false)
+    private User user;
+
+    /**
+     * 企业UU号
+     */
+    @Column(name = "prc_enuu")
+    private Long enUU;
+
+    /**
+     * 企业
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH })
+    @JoinColumn(name = "prc_enuu", insertable = false, updatable = false)
+    private Enterprise enterprise;
+
+    /**
+     * 单据对应的表名（值小写）
+     */
+    @Column(name = "prc_table")
+    private String table;
+
+    /**
+     * 单据分类（sale or purc）
+     */
+    @Column(name = "prc_category")
+    private String category;
+
+    /**
+     * 消息数量
+     */
+    @Column(name = "prc_count")
+    private Integer count;
+
+    /**
+     * 统计单据状态（-1为统计全部单据）
+     */
+    @Column(name = "prc_orderstatus")
+    private Integer orderStatus;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public String getTable() {
+        return table;
+    }
+
+    public void setTable(String table) {
+        this.table = table;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+}