系统错误返回

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -41,7 +41,7 @@ import java.util.*;
  * @create: 2018-10-22 11:29
  **/
 @Service
-public class SaleServiceImpl extends CommonBaseServiceImpl<SaleMapper,Sale> implements SaleService{
+public class SaleServiceImpl implements SaleService{
 
     @Autowired
     private SaleListMapper saleListMapper;
@@ -101,7 +101,7 @@ public class SaleServiceImpl extends CommonBaseServiceImpl<SaleMapper,Sale> impl
         //人员Id
         Long userId = BaseContextHolder.getUserId();
         //获取主表信息
-         SaleDTO main = formdata.getMain();
+        SaleDTO main = formdata.getMain();
         List<SaleDetailDTO> items = formdata.getItems();
         //插入从表数据
         List<SaleDetail> insertDetails = new ArrayList<>();

framework/core/src/main/java/com/usoftchina/saas/base/dto/CommonBaseDTO.java

@@ -9,28 +9,10 @@ import java.util.Date;
  */
 public abstract class CommonBaseDTO implements Serializable{
     protected Long id;
-
     protected Date createTime;
-    protected Long creatorId;
-    protected String creator;
-
+    protected String creatorName;
     protected Date updateTime;
-    protected Long updaterId;
-    protected String updater;
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator){
-        this.creator = creator;
-    }
-
-    public String getUpdater() { return updater; }
-
-    public void setUpdater(String updater){
-        this.updater = updater;
-    }
+    protected String updaterName;
 
     public Long getId() {
         return id;
@@ -48,12 +30,12 @@ public abstract class CommonBaseDTO implements Serializable{
         this.createTime = createTime;
     }
 
-    public Long getCreatorId() {
-        return creatorId;
+    public String getCreatorName() {
+        return creatorName;
     }
 
-    public void setCreatorId(Long creatorId) {
-        this.creatorId = creatorId;
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
     }
 
     public Date getUpdateTime() {
@@ -64,11 +46,11 @@ public abstract class CommonBaseDTO implements Serializable{
         this.updateTime = updateTime;
     }
 
-    public Long getUpdaterId() {
-        return updaterId;
+    public String getUpdaterName() {
+        return updaterName;
     }
 
-    public void setUpdaterId(Long updaterId) {
-        this.updaterId = updaterId;
+    public void setUpdaterName(String updaterName) {
+        this.updaterName = updaterName;
     }
 }

framework/core/src/main/java/com/usoftchina/saas/base/entity/BaseEntity.java

@@ -64,31 +64,4 @@ public abstract class BaseEntity<E extends Serializable> implements Serializable
      * @param companyId
      */
     public abstract void setCompanyId(long companyId);
-
-    /**
-     * get 创建人
-     *
-     * @return
-     */
-    public abstract String getCreator();
-
-    /**
-     * set 创建人
-     *
-     * @param creator
-     */
-    public abstract  void setCreator(String creator);
-
-    /**
-     * get 创建人
-     *
-     * @return
-     */
-    public abstract String getUpdater();
-    /**
-     * set 创建人
-     *
-     * @param updater
-     */
-    public abstract  void setUpdater(String updater);
 }

framework/core/src/main/java/com/usoftchina/saas/base/entity/CommonBaseEntity.java

@@ -12,15 +12,10 @@ public abstract class CommonBaseEntity extends BaseEntity<Long> {
      * company id
      */
     protected Long companyId;
-
-    protected Long creatorId;
-    protected String creator;
     protected Date createTime;
-
-    protected Long updaterId;
-    protected String updater;
+    protected Long creatorId;
     protected Date updateTime;
-
+    protected Long updaterId;
 
     @Override
     public Long getId() {
@@ -77,16 +72,4 @@ public abstract class CommonBaseEntity extends BaseEntity<Long> {
     public void setUpdaterId(long updaterId) {
         this.updaterId = updaterId;
     }
-
-    @Override
-    public String  getCreator(){return creator;};
-
-    @Override
-    public void setCreator(String creator){ this.creator = creator; };
-
-    @Override
-    public String getUpdater(){ return updater;};
-
-    @Override
-    public void setUpdater(String updater){ this.updater = updater; };
 }