--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/BaseRequestPath.java

@@ -37,6 +37,7 @@ public class BaseRequestPath {
 	public static final String AGREE = "/agree";
 	/** 单条修改 */
 	public static final String UPDATE = "/update";
+
 	/** 单条删除 */
 	public static final String DELETE = "/delete";
 	/** 批量操作 */
@@ -59,7 +60,8 @@ public class BaseRequestPath {
 	public static final String STATISTICS = "/statistics";
 	/** 总游览量*/
 	public static final String VISITCOUNT = "/visitcount";
-	
+	/** 投票 */
+	public static final String VOTE = "/vote";
 	
 	/** 分享 */
 	public static final String SHARE = "/share";

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/LoginMemberInfo.java

@@ -66,4 +66,6 @@ public class LoginMemberInfo {
 	@ApiModelProperty("微信openid")
 	@Transient
 	private String openid;
+	@ApiModelProperty("总抽奖次数")
+	private Integer sumPrizeCount;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/workmanagement/SaveUpdateWorkForm.java

@@ -27,6 +27,11 @@ public class SaveUpdateWorkForm {
 	@ApiModelProperty("联系方式")
 	private String phone;
 	
+	@ApiModelProperty("编号")
+	private Integer number;
+	
+	@ApiModelProperty("投票数")
+	private Integer voteNum; 
 	
 	@ApiModelProperty("合伙人姓名")
 	private String partnerName;

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/workmanagement/WorkmanagementForm.java

@@ -30,7 +30,10 @@ public class WorkmanagementForm {
 	private String workstatus;
 	
 	@ApiModelProperty("分页")
-	private PageParam pageParam;
+	private Integer pageNum;
+	
+	@ApiModelProperty("分页")
+	private Integer pageSize;
 	
 	
 	

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/workmanagement/FgUpdateWorkForm.java

+package com.zrqx.core.form.resource.fg.workmanagement;
+
+import java.util.List;
+
+import com.zrqx.core.model.resource.ebook.EbookDiyType;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgUpdateWorkForm {
+	@ApiModelProperty("ids")
+	private List<String> ids;
+	
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/member/Member.java

@@ -60,6 +60,9 @@ public class Member {
 	@ApiModelProperty("抽奖次数")
 	private Integer prizeCount;
 	
+	@ApiModelProperty("总抽奖次数")
+	private Integer sumPrizeCount;
+	
 	@ApiModelProperty("是否第一次分享 1:是 2:不是")
 	private Integer prizeCountType;
 	

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/workmanagement/WorkManagement.java

@@ -39,6 +39,11 @@ public class WorkManagement {
 	@ApiModelProperty("专属分类")
 	private Integer diytype;
 	
+	@ApiModelProperty("编号")
+	private Integer number;
+	
+	@ApiModelProperty("投票数")
+	private Integer voteNum;
 	
 	@ApiModelProperty("合伙人姓名")
 	private String partnerName;

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/workmanagement/WorkVote.java

+package com.zrqx.core.model.resource.workmanagement;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 作品记录每天用户是否投过票
+ * @author Conan
+ * @date 2020年7月13日上午10:59:15
+ */
+@ApiModel(value = "WorkVote",description = "作品")
+@Data
+@Table(name = "res_work_vote")
+public class WorkVote {
+
+	@ApiModelProperty("id")
+	@Id
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	private String id;
+	
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	
+	@ApiModelProperty(value = "用户id")
+	private Integer memberId;
+	
+	
+	
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/fg/workmanagement/FgWorkManagementVo.java

@@ -70,5 +70,11 @@ public class FgWorkManagementVo {
 	@ApiModelProperty(value = "点赞数量")
 	private Integer fabulousNum;
 	
+	@ApiModelProperty("编号")
+	private Integer number;
+	
+	@ApiModelProperty("投票数")
+	private Integer voteNum;
+	
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/fg/workmanagement/FgWorkmanagementListVo.java

@@ -27,5 +27,11 @@ public class FgWorkmanagementListVo {
 	@ApiModelProperty("系列中文名称")
 	private String seriesChinesename;
 	
+	@ApiModelProperty("编号")
+	private Integer number;
+	
+	@ApiModelProperty("投票数")
+	private Integer voteNum;
+	
 
 }