Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java

@@ -106,4 +106,21 @@ public class BaseResultBean<Obj> {
 
         return rs;
     }
+
+    @Override
+    public String toString() {
+        return "BaseResultBean{" +
+                "success=" + success +
+                ", code='" + code + '\'' +
+                ", msg='" + msg + '\'' +
+                ", errorMsg='" + errorMsg + '\'' +
+                ", url='" + url + '\'' +
+                ", resultList=" + resultList +
+                ", resultObject=" + resultObject +
+                ", listPager=" + listPager +
+                ", resultMap=" + resultMap +
+                ", pager=" + pager +
+                ", totalCount=" + totalCount +
+                '}';
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description : 模块枚举类
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 21:08
+ * @Modify:
+ **/
+public class BlockEnumUtil {
+
+
+    /**
+     * 报表元素枚举
+     * WORDS(1,"文字"),PIC(2,"图片"),REPORT(3,"报表");
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_ELEMENT_TYPE{
+
+        WORDS(1,"文字"),PIC(2,"图片"),REPORT(3,"报表");
+
+        private int value;
+        private String description;
+
+        REPORT_ELEMENT_TYPE() {
+        }
+
+        REPORT_ELEMENT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 类属性选择模型
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-29 15:17
+ * @Modify:
+ **/
+@Getter
+@Setter
+@ToString
+public class ClassFieldModel implements Serializable {
+
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="类名")
+    private String clzSimpleName;
+
+    @ApiParam(value ="类全名")
+    private String clzFullName;
+
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 报表类选择模型
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-29 15:17
+ * @Modify:
+ **/
+@Getter
+@Setter
+@ToString
+public class ClassModel implements Serializable {
+
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="类名")
+    private String clzSimpleName;
+
+    @ApiParam(value ="类全名")
+    private String clzFullName;
+
+    @ApiParam(value ="类描述")
+    private String clzDesc;
+}

modules/i3plus-pojo-report/pom.xml

@@ -13,5 +13,11 @@
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
 
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
 </project>

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 数据元素
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_ELEMENT")
+@Api(value="数据元素",description = "数据元素绑定对应的列")
+public class BrElement extends BaseBean {
+
+    @Column(name="ELEMENT_NAME")
+    @ApiParam(value ="元素名称")
+    private String elementName;
+
+    @Column(name="ELEMENT_TYPE")
+    @ApiParam(value ="元素类型")
+    //BlockEnumUtil.REPORT_ELEMENT_TYPE
+    private Integer elementType;
+
+    @Column(name="ELEMENT_VALUE")
+    @ApiParam(value ="元素值")
+    private String elementValue;
+
+    @Column(name="ELEMENT_LINK")
+    @ApiParam(value ="元素连接")
+    private String elementLink;
+
+    @Column(name="ELEMENT_STYLE")
+    @ApiParam(value ="元素样式css")
+    private String elementStyle;
+
+    @Transient
+    @ApiParam(value ="元素明细列表")
+    private List<BrReportElementDetail> brReportElementDetailList;
+
+    @Transient
+    @ApiParam(value ="元素所在的列")
+    private BrLayoutColumn brLayoutColumn;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 自定义报表布局
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_LAYOUT")
+@Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1")
+public class BrLayout extends BaseBean {
+
+    @Column(name="LAYOUT_NAME")
+    @ApiParam(value ="名称")
+    private String layoutName;
+
+    @Column(name="LAYOUT_WIDTH")
+    @ApiParam(value ="布局宽度")
+    private Double layoutWidth;
+
+    @Column(name="LAYOUT_HEIGHT")
+    @ApiParam(value ="布局高度")
+    private Double layoutHeight;
+
+    @Column(name="ROW_COUNT")
+    @ApiParam(value ="行数")
+    private Integer rowCount;
+
+    @Column(name="COLUMN_COUNT")
+    @ApiParam(value ="列数")
+    private Integer columnCount;
+
+    @Column(name="SEQ")
+    @ApiParam(value ="排序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam(value ="模板行列表")
+    private List<BrLayoutRow> brLayoutRowList;
+
+    @Transient
+    @ApiParam(value ="使用模板的报表")
+    private List<BrReport> brReportList;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java

@@ -0,0 +1,68 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 自定义报表布局
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_LAYOUT_COLUMN")
+@Api(value="自定义报表布局-列",description = "一行包含多列")
+public class BrLayoutColumn extends BaseBean {
+
+    @Column(name="LAYOUT_ID")
+    @ApiParam(value ="布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
+
+    @Column(name="LAYOUT_ROW_ID")
+    @ApiParam(value ="行主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutRowId;
+
+    @Column(name="COLUMN_CROSS")
+    @ApiParam(value ="跨列数")
+    private Integer columnCross;
+
+    @Column(name="COLUMN_WIDTH")
+    @ApiParam(value ="列宽")
+    private Integer columnWidth;
+
+    @Column(name="SEQ")
+    @ApiParam(value ="排序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam(value ="列所在的行")
+    private BrLayoutRow brLayoutRow;
+
+    @Transient
+    @ApiParam(value ="列所包含的元素")
+    private List<BrElement> brElementList;
+
+    @Transient
+    @ApiParam(value ="列所包含的报表模板")
+    private List<BrReportTemplate> brReportTemplateList;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 自定义报表布局
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_LAYOUT_ROW")
+@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
+public class BrLayoutRow extends BaseBean {
+
+    @Column(name="LAYOUT_ID")
+    @ApiParam(value ="布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
+
+    @Column(name="ROW_CROSS")
+    @ApiParam(value ="跨行")
+    private Integer rowCross;
+
+    @Column(name="ROW_HEIGHT")
+    @ApiParam(value ="行高")
+    private Integer rowHeight;
+
+    @Column(name="SEQ")
+    @ApiParam(value ="排序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam(value ="行所在的布局")
+    private BrLayout brLayout;
+
+    @Transient
+    @ApiParam(value ="行所包含的列")
+    private List<BrLayoutColumn> brLayoutColumns;
+
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 报表实例
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_REPORT")
+@Api(value="自定义报表",description = "所有报表实例，生成最后的报表")
+public class BrReport extends BaseBean {
+
+    @Column(name="REPORT_NAME")
+    @ApiParam(value ="报表名称")
+    private String reportName;
+
+    @Column(name="LAYOUT_ID")
+    @ApiParam(value ="布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
+
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="模块")
+    //所属模块，CommonEnumUtil.SOFT_TYPE
+    private Integer softType;
+
+    @Column(name="SEQ")
+    @ApiParam(value ="排序")
+    private Integer seq;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportElementDetail.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 元素和报表关联表，多对多
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_REPORT_ELEMENT_DETAIL")
+@Api(value="元素&报表",description = "元素和报表的关联表 * -》 *")
+public class BrReportElementDetail extends BaseBean {
+
+    @Column(name = "REPORT_ID")
+    @ApiParam(value = "报表主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long reportId;
+
+    @Column(name = "ELEMENT_ID")
+    @ApiParam(value = "元素主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
+    @Column(name = "LAYOUT_COLUMN_ID")
+    @ApiParam(value = "列主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutColumnId;
+
+
+    @Transient
+    @ApiParam(value = "报表实例")
+    private BrReport brReport;
+
+    @Transient
+    @ApiParam(value = "报表元素")
+    private BrElement brElement;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 自定义报表模板
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BrReportTemplate")
+@Api(value="自定义报表模板",description = "报表模板，实现对应的报表生成方法")
+public class BrReportTemplate extends BaseBean {
+
+    @Column(name="LAYOUT_ID")
+    @ApiParam(value ="布局主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutId;
+
+    @Column(name="LAYOUT_COLUMN_ID")
+    @ApiParam(value ="列主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutColumnId;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam(value ="模板名称")
+    private String templateName;
+
+    @Transient
+    @ApiParam(value ="报表模板列表")
+    private List<BrReportTemplateDetail> brReportTemplateDetailList;
+
+    @Transient
+    @ApiParam(value ="元素所在的列")
+    private BrLayoutColumn brLayoutColumn;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplateDetail.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 报表模板和报表关联表，多对多
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-25 19:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_REPORT_TEMPLATE_DETAIL")
+@Api(value="报表模板&报表",description = "报表模板和报表的关联表 * -》 *")
+public class BrReportTemplateDetail extends BaseBean {
+
+    @Column(name="REPORT_ID")
+    @ApiParam(value ="报表主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long reportId;
+
+    @Column(name="REPORT_TEMPLATE_ID")
+    @ApiParam(value ="报表模板主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long reportTemplateId;
+
+    @Column(name="LAYOUT_COLUMN_ID")
+    @ApiParam(value ="列主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long layoutColumnId;
+
+
+    @Transient
+    @ApiParam(value = "报表实例")
+    private BrReport brReport;
+
+    @Transient
+    @ApiParam(value = "报表模板")
+    private BrReportTemplate brReportTemplate;
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrElementRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrElementRepository extends BaseRepository<BrElement,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrLayout;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrLayoutRepository extends BaseRepository<BrLayout,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrLayoutRow;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportElementDetailRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrReportElementDetail;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrReportElementDetailRepository extends BaseRepository<BrReportElementDetail,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrReport;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrReportRepository extends BaseRepository<BrReport,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateDetailRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrReportTemplateDetail;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrReportTemplateDetailRepository extends BaseRepository<BrReportTemplateDetail,Long> {
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrReportTemplate;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-26 20:23
+ * @Modify:
+ **/
+public interface BrReportTemplateRepository extends BaseRepository<BrReportTemplate,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java

@@ -117,7 +117,7 @@ public class WmsMoveDetails extends BaseBean {
 
     public WmsMoveDetails(){}
 
-    public WmsMoveDetails(String partNo, long waitingCounts ,long finishedCounts){
+    public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
         this.partNo = partNo;
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
@@ -128,4 +128,12 @@ public class WmsMoveDetails extends BaseBean {
         this.qty = qty;
         this.transQty = transQty;
     }
+
+    public Long getWaitingCounts() {
+        return waitingCounts == null ? 0L : this.waitingCounts;
+    }
+
+    public Long getFinishedCounts() {
+        return finishedCounts == null ? 0L : this.finishedCounts;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -86,17 +86,25 @@ public class WmsMoveSn extends BaseBean {
 
     @ApiParam("待上架箱数")
     @Transient
-    private long waitingCounts;
+    private Long waitingCounts;
 
     @ApiParam("已上架箱数")
     @Transient
-    private long finishedCounts;
+    private Long finishedCounts;
 
     public WmsMoveSn(){}
 
-    public WmsMoveSn(String partNo, long finishedCounts ,long waitingCounts){
+    public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
         this.partNo = partNo;
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
     }
+
+    public Long getWaitingCounts() {
+        return waitingCounts == null ? 0L : this.waitingCounts;
+    }
+
+    public Long getFinishedCounts() {
+        return finishedCounts == null ? 0L : this.finishedCounts;
+    }
 }