xgb 1 месяц назад
Родитель
Сommit
dfc5b3b4fc
23 измененных файлов с 1102 добавлено и 124 удалено
  1. 4 2
      fs-admin/src/main/java/com/fs/app/controller/AccPrizeInfoController.java
  2. 104 0
      fs-admin/src/main/java/com/fs/app/controller/AccTeamController.java
  3. 104 0
      fs-admin/src/main/java/com/fs/app/controller/AccTeamMemberController.java
  4. 104 0
      fs-admin/src/main/java/com/fs/app/controller/AccVoteRecordController.java
  5. 2 0
      fs-service/src/main/java/com/fs/activity/domain/AccPrize.java
  6. 6 0
      fs-service/src/main/java/com/fs/activity/domain/AccPrizeInfo.java
  7. 14 68
      fs-service/src/main/java/com/fs/activity/domain/AccTeam.java
  8. 14 52
      fs-service/src/main/java/com/fs/activity/domain/AccTeamMember.java
  9. 50 0
      fs-service/src/main/java/com/fs/activity/mapper/AccTeamMapper.java
  10. 49 0
      fs-service/src/main/java/com/fs/activity/mapper/AccTeamMemberMapper.java
  11. 49 0
      fs-service/src/main/java/com/fs/activity/mapper/AccVoteRecordMapper.java
  12. 50 0
      fs-service/src/main/java/com/fs/activity/service/AccTeamMemberService.java
  13. 50 0
      fs-service/src/main/java/com/fs/activity/service/AccTeamService.java
  14. 49 0
      fs-service/src/main/java/com/fs/activity/service/AccVoteRecordService.java
  15. 4 0
      fs-service/src/main/java/com/fs/activity/service/impl/AccPrizeInfoServiceImpl.java
  16. 74 0
      fs-service/src/main/java/com/fs/activity/service/impl/AccTeamMemberServiceImpl.java
  17. 73 0
      fs-service/src/main/java/com/fs/activity/service/impl/AccTeamServiceImpl.java
  18. 75 0
      fs-service/src/main/java/com/fs/activity/service/impl/AccVoteRecordServiceImpl.java
  19. 3 0
      fs-service/src/main/java/com/fs/activity/service/impl/AccWorkServiceImpl.java
  20. 88 0
      fs-service/src/main/resources/mapper/activity/AccTeamMapper.xml
  21. 71 0
      fs-service/src/main/resources/mapper/activity/AccTeamMemberMapper.xml
  22. 63 0
      fs-service/src/main/resources/mapper/activity/AccVoteRecordMapper.xml
  23. 2 2
      fs-service/src/main/resources/mapper/activity/AccWorkMapper.xml

+ 4 - 2
fs-admin/src/main/java/com/fs/app/controller/AccPrizeInfoController.java

@@ -1,6 +1,8 @@
 package com.fs.app.controller;
 
 import java.util.List;
+
+import com.fs.activity.service.AccPrizeInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,7 +18,6 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.enums.BusinessType;
 import com.fs.activity.domain.AccPrizeInfo;
-import com.fs.activity.service.AccPrizeInfoService;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.common.core.page.TableDataInfo;
 
@@ -24,7 +25,7 @@ import com.fs.common.core.page.TableDataInfo;
  * 获奖记录Controller
  *
  * @author fs
- * @date 2026-03-12
+ * @date 2026-03-13
  */
 @RestController
 @RequestMapping("/prizeInfo/prizeInfo")
@@ -87,6 +88,7 @@ public class AccPrizeInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody AccPrizeInfo accPrizeInfo)
     {
+        accPrizeInfo.setAuditorId(getUserId());
         return toAjax(accPrizeInfoService.updateAccPrizeInfo(accPrizeInfo));
     }
 

+ 104 - 0
fs-admin/src/main/java/com/fs/app/controller/AccTeamController.java

@@ -0,0 +1,104 @@
+package com.fs.app.controller;
+
+import java.util.List;
+
+import com.fs.activity.service.AccTeamService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.activity.domain.AccTeam;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 团队Controller
+ *
+ * @author fs
+ * @date 2026-03-13
+ */
+@RestController
+@RequestMapping("/team/team")
+public class AccTeamController extends BaseController
+{
+    @Autowired
+    private AccTeamService accTeamService;
+
+    /**
+     * 查询团队列表
+     */
+    @PreAuthorize("@ss.hasPermi('team:team:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AccTeam accTeam)
+    {
+        startPage();
+        List<AccTeam> list = accTeamService.selectAccTeamList(accTeam);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出团队列表
+     */
+    @PreAuthorize("@ss.hasPermi('team:team:export')")
+    @Log(title = "团队", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(AccTeam accTeam)
+    {
+        List<AccTeam> list = accTeamService.selectAccTeamList(accTeam);
+        ExcelUtil<AccTeam> util = new ExcelUtil<AccTeam>(AccTeam.class);
+        return util.exportExcel(list, "团队数据");
+    }
+
+    /**
+     * 获取团队详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('team:team:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(accTeamService.selectAccTeamById(id));
+    }
+
+    /**
+     * 新增团队
+     */
+    @PreAuthorize("@ss.hasPermi('team:team:add')")
+    @Log(title = "团队", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AccTeam accTeam)
+    {
+        return toAjax(accTeamService.insertAccTeam(accTeam));
+    }
+
+    /**
+     * 修改团队
+     */
+    @PreAuthorize("@ss.hasPermi('team:team:edit')")
+    @Log(title = "团队", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AccTeam accTeam)
+    {
+        return toAjax(accTeamService.updateAccTeam(accTeam));
+    }
+
+    /**
+     * 删除团队
+     */
+    @PreAuthorize("@ss.hasPermi('team:team:remove')")
+    @Log(title = "团队", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(accTeamService.deleteAccTeamByIds(ids));
+    }
+}

+ 104 - 0
fs-admin/src/main/java/com/fs/app/controller/AccTeamMemberController.java

@@ -0,0 +1,104 @@
+package com.fs.app.controller;
+
+import java.util.List;
+
+import com.fs.activity.service.AccTeamMemberService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.activity.domain.AccTeamMember;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 团队成员Controller
+ *
+ * @author fs
+ * @date 2026-03-13
+ */
+@RestController
+@RequestMapping("/member/member")
+public class AccTeamMemberController extends BaseController
+{
+    @Autowired
+    private AccTeamMemberService accTeamMemberService;
+
+    /**
+     * 查询团队成员列表
+     */
+    @PreAuthorize("@ss.hasPermi('member:member:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AccTeamMember accTeamMember)
+    {
+        startPage();
+        List<AccTeamMember> list = accTeamMemberService.selectAccTeamMemberList(accTeamMember);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出团队成员列表
+     */
+    @PreAuthorize("@ss.hasPermi('member:member:export')")
+    @Log(title = "团队成员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(AccTeamMember accTeamMember)
+    {
+        List<AccTeamMember> list = accTeamMemberService.selectAccTeamMemberList(accTeamMember);
+        ExcelUtil<AccTeamMember> util = new ExcelUtil<AccTeamMember>(AccTeamMember.class);
+        return util.exportExcel(list, "团队成员数据");
+    }
+
+    /**
+     * 获取团队成员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('member:member:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(accTeamMemberService.selectAccTeamMemberById(id));
+    }
+
+    /**
+     * 新增团队成员
+     */
+    @PreAuthorize("@ss.hasPermi('member:member:add')")
+    @Log(title = "团队成员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AccTeamMember accTeamMember)
+    {
+        return toAjax(accTeamMemberService.insertAccTeamMember(accTeamMember));
+    }
+
+    /**
+     * 修改团队成员
+     */
+    @PreAuthorize("@ss.hasPermi('member:member:edit')")
+    @Log(title = "团队成员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AccTeamMember accTeamMember)
+    {
+        return toAjax(accTeamMemberService.updateAccTeamMember(accTeamMember));
+    }
+
+    /**
+     * 删除团队成员
+     */
+    @PreAuthorize("@ss.hasPermi('member:member:remove')")
+    @Log(title = "团队成员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(accTeamMemberService.deleteAccTeamMemberByIds(ids));
+    }
+}

+ 104 - 0
fs-admin/src/main/java/com/fs/app/controller/AccVoteRecordController.java

@@ -0,0 +1,104 @@
+package com.fs.app.controller;
+
+import java.util.List;
+
+import com.fs.activity.service.AccVoteRecordService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.activity.domain.AccVoteRecord;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 投票记录Controller
+ *
+ * @author fs
+ * @date 2026-03-13
+ */
+@RestController
+@RequestMapping("/voteRecord/voteRecord")
+public class AccVoteRecordController extends BaseController
+{
+    @Autowired
+    private AccVoteRecordService accVoteRecordService;
+
+    /**
+     * 查询投票记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('voteRecord:voteRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(AccVoteRecord accVoteRecord)
+    {
+        startPage();
+        List<AccVoteRecord> list = accVoteRecordService.selectAccVoteRecordList(accVoteRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出投票记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('voteRecord:voteRecord:export')")
+    @Log(title = "投票记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(AccVoteRecord accVoteRecord)
+    {
+        List<AccVoteRecord> list = accVoteRecordService.selectAccVoteRecordList(accVoteRecord);
+        ExcelUtil<AccVoteRecord> util = new ExcelUtil<AccVoteRecord>(AccVoteRecord.class);
+        return util.exportExcel(list, "投票记录数据");
+    }
+
+    /**
+     * 获取投票记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('voteRecord:voteRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(accVoteRecordService.selectAccVoteRecordById(id));
+    }
+
+    /**
+     * 新增投票记录
+     */
+    @PreAuthorize("@ss.hasPermi('voteRecord:voteRecord:add')")
+    @Log(title = "投票记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AccVoteRecord accVoteRecord)
+    {
+        return toAjax(accVoteRecordService.insertAccVoteRecord(accVoteRecord));
+    }
+
+    /**
+     * 修改投票记录
+     */
+    @PreAuthorize("@ss.hasPermi('voteRecord:voteRecord:edit')")
+    @Log(title = "投票记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AccVoteRecord accVoteRecord)
+    {
+        return toAjax(accVoteRecordService.updateAccVoteRecord(accVoteRecord));
+    }
+
+    /**
+     * 删除投票记录
+     */
+    @PreAuthorize("@ss.hasPermi('voteRecord:voteRecord:remove')")
+    @Log(title = "投票记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(accVoteRecordService.deleteAccVoteRecordByIds(ids));
+    }
+}

+ 2 - 0
fs-service/src/main/java/com/fs/activity/domain/AccPrize.java

@@ -1,5 +1,6 @@
 package com.fs.activity.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
@@ -17,6 +18,7 @@ import lombok.EqualsAndHashCode;
 public class AccPrize extends BaseEntity{
 
     /** 组建id */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 奖品编号 */

+ 6 - 0
fs-service/src/main/java/com/fs/activity/domain/AccPrizeInfo.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,6 +23,7 @@ import lombok.EqualsAndHashCode;
 public class AccPrizeInfo{
 
     /** 主键ID */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 活动ID */
@@ -83,6 +85,10 @@ public class AccPrizeInfo{
     @Excel(name = "审核人ID", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedTime;
 
+    private String createBy;
+
+    private String updateBy;
+
     /** 请求参数 */
     @TableField(exist = false)
     private Map<String, Object> params;

+ 14 - 68
fs-service/src/main/java/com/fs/activity/domain/AccTeam.java

@@ -1,9 +1,13 @@
 package com.fs.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.Data;
 
 /**
@@ -84,76 +88,18 @@ public class AccTeam {
      */
     private Date updatedAt;
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
+    /** 请求参数 */
+    @TableField(exist = false)
+    private Map<String, Object> params;
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
         }
-        AccTeam other = (AccTeam) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getActivityId() == null ? other.getActivityId() == null : this.getActivityId().equals(other.getActivityId()))
-            && (this.getTeamCode() == null ? other.getTeamCode() == null : this.getTeamCode().equals(other.getTeamCode()))
-            && (this.getTeamName() == null ? other.getTeamName() == null : this.getTeamName().equals(other.getTeamName()))
-            && (this.getCity() == null ? other.getCity() == null : this.getCity().equals(other.getCity()))
-            && (this.getLeaderId() == null ? other.getLeaderId() == null : this.getLeaderId().equals(other.getLeaderId()))
-            && (this.getLeaderName() == null ? other.getLeaderName() == null : this.getLeaderName().equals(other.getLeaderName()))
-            && (this.getLeaderPhone() == null ? other.getLeaderPhone() == null : this.getLeaderPhone().equals(other.getLeaderPhone()))
-            && (this.getMemberCount() == null ? other.getMemberCount() == null : this.getMemberCount().equals(other.getMemberCount()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getAuditRemark() == null ? other.getAuditRemark() == null : this.getAuditRemark().equals(other.getAuditRemark()))
-            && (this.getAuditTime() == null ? other.getAuditTime() == null : this.getAuditTime().equals(other.getAuditTime()))
-            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
-            && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()));
+        return params;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getActivityId() == null) ? 0 : getActivityId().hashCode());
-        result = prime * result + ((getTeamCode() == null) ? 0 : getTeamCode().hashCode());
-        result = prime * result + ((getTeamName() == null) ? 0 : getTeamName().hashCode());
-        result = prime * result + ((getCity() == null) ? 0 : getCity().hashCode());
-        result = prime * result + ((getLeaderId() == null) ? 0 : getLeaderId().hashCode());
-        result = prime * result + ((getLeaderName() == null) ? 0 : getLeaderName().hashCode());
-        result = prime * result + ((getLeaderPhone() == null) ? 0 : getLeaderPhone().hashCode());
-        result = prime * result + ((getMemberCount() == null) ? 0 : getMemberCount().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getAuditRemark() == null) ? 0 : getAuditRemark().hashCode());
-        result = prime * result + ((getAuditTime() == null) ? 0 : getAuditTime().hashCode());
-        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
-        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
-        return result;
-    }
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", activityId=").append(activityId);
-        sb.append(", teamCode=").append(teamCode);
-        sb.append(", teamName=").append(teamName);
-        sb.append(", city=").append(city);
-        sb.append(", leaderId=").append(leaderId);
-        sb.append(", leaderName=").append(leaderName);
-        sb.append(", leaderPhone=").append(leaderPhone);
-        sb.append(", memberCount=").append(memberCount);
-        sb.append(", status=").append(status);
-        sb.append(", auditRemark=").append(auditRemark);
-        sb.append(", auditTime=").append(auditTime);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append("]");
-        return sb.toString();
-    }
 }

+ 14 - 52
fs-service/src/main/java/com/fs/activity/domain/AccTeamMember.java

@@ -1,9 +1,13 @@
 package com.fs.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.Data;
 
 /**
@@ -56,58 +60,16 @@ public class AccTeamMember {
 
     private Long activityId;
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        AccTeamMember other = (AccTeamMember) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getTeamId() == null ? other.getTeamId() == null : this.getTeamId().equals(other.getTeamId()))
-            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
-            && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
-            && (this.getJoinTime() == null ? other.getJoinTime() == null : this.getJoinTime().equals(other.getJoinTime()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
-            && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getTeamId() == null) ? 0 : getTeamId().hashCode());
-        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
-        result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
-        result = prime * result + ((getJoinTime() == null) ? 0 : getJoinTime().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
-        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
-        return result;
-    }
+    /** 请求参数 */
+    @TableField(exist = false)
+    private Map<String, Object> params;
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", teamId=").append(teamId);
-        sb.append(", userId=").append(userId);
-        sb.append(", userName=").append(userName);
-        sb.append(", joinTime=").append(joinTime);
-        sb.append(", status=").append(status);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append("]");
-        return sb.toString();
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
     }
 }

+ 50 - 0
fs-service/src/main/java/com/fs/activity/mapper/AccTeamMapper.java

@@ -4,6 +4,8 @@ import com.fs.activity.domain.AccTeam;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_team(团队表)】的数据库操作Mapper
@@ -12,6 +14,54 @@ import org.apache.ibatis.annotations.Param;
 */
 public interface AccTeamMapper extends BaseMapper<AccTeam> {
 
+    /**
+     * 查询团队
+     *
+     * @param id 团队主键
+     * @return 团队
+     */
+    AccTeam selectAccTeamById(Long id);
+
+    /**
+     * 查询团队列表
+     *
+     * @param accTeam 团队
+     * @return 团队集合
+     */
+    List<AccTeam> selectAccTeamList(AccTeam accTeam);
+
+    /**
+     * 新增团队
+     *
+     * @param accTeam 团队
+     * @return 结果
+     */
+    int insertAccTeam(AccTeam accTeam);
+
+    /**
+     * 修改团队
+     *
+     * @param accTeam 团队
+     * @return 结果
+     */
+    int updateAccTeam(AccTeam accTeam);
+
+    /**
+     * 删除团队
+     *
+     * @param id 团队主键
+     * @return 结果
+     */
+    int deleteAccTeamById(Long id);
+
+    /**
+     * 批量删除团队
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteAccTeamByIds(Long[] ids);
+
     AccTeam isSignUp(@Param("userId") Long userId,@Param("activityId") Long activityId);
 
     AccTeam selectTeamByUserIdAndActivityId(@Param("userId") Long userId,@Param("activityId") Long activityId);

+ 49 - 0
fs-service/src/main/java/com/fs/activity/mapper/AccTeamMemberMapper.java

@@ -3,6 +3,8 @@ package com.fs.activity.mapper;
 import com.fs.activity.domain.AccTeamMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_team_member(团队成员表)】的数据库操作Mapper
@@ -11,6 +13,53 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface AccTeamMemberMapper extends BaseMapper<AccTeamMember> {
 
+    /**
+     * 查询团队成员
+     *
+     * @param id 团队成员主键
+     * @return 团队成员
+     */
+    AccTeamMember selectAccTeamMemberById(Long id);
+
+    /**
+     * 查询团队成员列表
+     *
+     * @param accTeamMember 团队成员
+     * @return 团队成员集合
+     */
+    List<AccTeamMember> selectAccTeamMemberList(AccTeamMember accTeamMember);
+
+    /**
+     * 新增团队成员
+     *
+     * @param accTeamMember 团队成员
+     * @return 结果
+     */
+    int insertAccTeamMember(AccTeamMember accTeamMember);
+
+    /**
+     * 修改团队成员
+     *
+     * @param accTeamMember 团队成员
+     * @return 结果
+     */
+    int updateAccTeamMember(AccTeamMember accTeamMember);
+
+    /**
+     * 删除团队成员
+     *
+     * @param id 团队成员主键
+     * @return 结果
+     */
+    int deleteAccTeamMemberById(Long id);
+
+    /**
+     * 批量删除团队成员
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteAccTeamMemberByIds(Long[] ids);
 }
 
 

+ 49 - 0
fs-service/src/main/java/com/fs/activity/mapper/AccVoteRecordMapper.java

@@ -3,6 +3,8 @@ package com.fs.activity.mapper;
 import com.fs.activity.domain.AccVoteRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_vote_record(投票记录表)】的数据库操作Mapper
@@ -11,6 +13,53 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface AccVoteRecordMapper extends BaseMapper<AccVoteRecord> {
 
+    /**
+     * 查询投票记录
+     *
+     * @param id 投票记录主键
+     * @return 投票记录
+     */
+    AccVoteRecord selectAccVoteRecordById(Long id);
+
+    /**
+     * 查询投票记录列表
+     *
+     * @param accVoteRecord 投票记录
+     * @return 投票记录集合
+     */
+    List<AccVoteRecord> selectAccVoteRecordList(AccVoteRecord accVoteRecord);
+
+    /**
+     * 新增投票记录
+     *
+     * @param accVoteRecord 投票记录
+     * @return 结果
+     */
+    int insertAccVoteRecord(AccVoteRecord accVoteRecord);
+
+    /**
+     * 修改投票记录
+     *
+     * @param accVoteRecord 投票记录
+     * @return 结果
+     */
+    int updateAccVoteRecord(AccVoteRecord accVoteRecord);
+
+    /**
+     * 删除投票记录
+     *
+     * @param id 投票记录主键
+     * @return 结果
+     */
+    int deleteAccVoteRecordById(Long id);
+
+    /**
+     * 批量删除投票记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteAccVoteRecordByIds(Long[] ids);
 }
 
 

+ 50 - 0
fs-service/src/main/java/com/fs/activity/service/AccTeamMemberService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.activity.param.AccTeamMemberRequest;
 import com.fs.common.core.domain.R;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_team_member(团队成员表)】的数据库操作Service
@@ -15,4 +17,52 @@ public interface AccTeamMemberService extends IService<AccTeamMember> {
     R getUserTeamMember(Long activityId, Long teamId);
 
     R deleteTeamMember(AccTeamMemberRequest accTeam);
+
+    /**
+     * 查询团队成员
+     *
+     * @param id 团队成员主键
+     * @return 团队成员
+     */
+    AccTeamMember selectAccTeamMemberById(Long id);
+
+    /**
+     * 查询团队成员列表
+     *
+     * @param accTeamMember 团队成员
+     * @return 团队成员集合
+     */
+    List<AccTeamMember> selectAccTeamMemberList(AccTeamMember accTeamMember);
+
+    /**
+     * 新增团队成员
+     *
+     * @param accTeamMember 团队成员
+     * @return 结果
+     */
+    int insertAccTeamMember(AccTeamMember accTeamMember);
+
+    /**
+     * 修改团队成员
+     *
+     * @param accTeamMember 团队成员
+     * @return 结果
+     */
+    int updateAccTeamMember(AccTeamMember accTeamMember);
+
+    /**
+     * 批量删除团队成员
+     *
+     * @param ids 需要删除的团队成员主键集合
+     * @return 结果
+     */
+    int deleteAccTeamMemberByIds(Long[] ids);
+
+    /**
+     * 删除团队成员信息
+     *
+     * @param id 团队成员主键
+     * @return 结果
+     */
+    int deleteAccTeamMemberById(Long id);
 }

+ 50 - 0
fs-service/src/main/java/com/fs/activity/service/AccTeamService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.activity.param.AccTeamMemberRequest;
 import com.fs.common.core.domain.R;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_team(团队表)】的数据库操作Service
@@ -26,4 +28,52 @@ public interface AccTeamService extends IService<AccTeam> {
     R signUp(AccTeamMemberRequest accTeam);
 
     R getUserTeam(Long userId,Long activityId);
+
+    /**
+     * 查询团队
+     *
+     * @param id 团队主键
+     * @return 团队
+     */
+    AccTeam selectAccTeamById(Long id);
+
+    /**
+     * 查询团队列表
+     *
+     * @param accTeam 团队
+     * @return 团队集合
+     */
+    List<AccTeam> selectAccTeamList(AccTeam accTeam);
+
+    /**
+     * 新增团队
+     *
+     * @param accTeam 团队
+     * @return 结果
+     */
+    int insertAccTeam(AccTeam accTeam);
+
+    /**
+     * 修改团队
+     *
+     * @param accTeam 团队
+     * @return 结果
+     */
+    int updateAccTeam(AccTeam accTeam);
+
+    /**
+     * 批量删除团队
+     *
+     * @param ids 需要删除的团队主键集合
+     * @return 结果
+     */
+    int deleteAccTeamByIds(Long[] ids);
+
+    /**
+     * 删除团队信息
+     *
+     * @param id 团队主键
+     * @return 结果
+     */
+    int deleteAccTeamById(Long id);
 }

+ 49 - 0
fs-service/src/main/java/com/fs/activity/service/AccVoteRecordService.java

@@ -3,6 +3,8 @@ package com.fs.activity.service;
 import com.fs.activity.domain.AccVoteRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_vote_record(投票记录表)】的数据库操作Service
@@ -10,4 +12,51 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface AccVoteRecordService extends IService<AccVoteRecord> {
 
+    /**
+     * 查询投票记录
+     *
+     * @param id 投票记录主键
+     * @return 投票记录
+     */
+    AccVoteRecord selectAccVoteRecordById(Long id);
+
+    /**
+     * 查询投票记录列表
+     *
+     * @param accVoteRecord 投票记录
+     * @return 投票记录集合
+     */
+    List<AccVoteRecord> selectAccVoteRecordList(AccVoteRecord accVoteRecord);
+
+    /**
+     * 新增投票记录
+     *
+     * @param accVoteRecord 投票记录
+     * @return 结果
+     */
+    int insertAccVoteRecord(AccVoteRecord accVoteRecord);
+
+    /**
+     * 修改投票记录
+     *
+     * @param accVoteRecord 投票记录
+     * @return 结果
+     */
+    int updateAccVoteRecord(AccVoteRecord accVoteRecord);
+
+    /**
+     * 批量删除投票记录
+     *
+     * @param ids 需要删除的投票记录主键集合
+     * @return 结果
+     */
+    int deleteAccVoteRecordByIds(Long[] ids);
+
+    /**
+     * 删除投票记录信息
+     *
+     * @param id 投票记录主键
+     * @return 结果
+     */
+    int deleteAccVoteRecordById(Long id);
 }

+ 4 - 0
fs-service/src/main/java/com/fs/activity/service/impl/AccPrizeInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.activity.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.activity.service.AccPrizeInfoService;
@@ -61,6 +62,9 @@ public class AccPrizeInfoServiceImpl extends ServiceImpl<AccPrizeInfoMapper, Acc
     @Override
     public int updateAccPrizeInfo(AccPrizeInfo accPrizeInfo)
     {
+        if(accPrizeInfo.getStatus()!=null){
+            accPrizeInfo.setAuditTime(new Date());
+        }
         return baseMapper.updateAccPrizeInfo(accPrizeInfo);
     }
 

+ 74 - 0
fs-service/src/main/java/com/fs/activity/service/impl/AccTeamMemberServiceImpl.java

@@ -32,6 +32,80 @@ public class AccTeamMemberServiceImpl extends ServiceImpl<AccTeamMemberMapper, A
     @Autowired
     private AccTeamMapper accTeamMapper;
 
+    /**
+     * 查询团队成员
+     *
+     * @param id 团队成员主键
+     * @return 团队成员
+     */
+    @Override
+    public AccTeamMember selectAccTeamMemberById(Long id)
+    {
+        return baseMapper.selectAccTeamMemberById(id);
+    }
+
+    /**
+     * 查询团队成员列表
+     *
+     * @param accTeamMember 团队成员
+     * @return 团队成员
+     */
+    @Override
+    public List<AccTeamMember> selectAccTeamMemberList(AccTeamMember accTeamMember)
+    {
+        return baseMapper.selectAccTeamMemberList(accTeamMember);
+    }
+
+    /**
+     * 新增团队成员
+     *
+     * @param accTeamMember 团队成员
+     * @return 结果
+     */
+    @Override
+    public int insertAccTeamMember(AccTeamMember accTeamMember)
+    {
+        return baseMapper.insertAccTeamMember(accTeamMember);
+    }
+
+    /**
+     * 修改团队成员
+     *
+     * @param accTeamMember 团队成员
+     * @return 结果
+     */
+    @Override
+    public int updateAccTeamMember(AccTeamMember accTeamMember)
+    {
+        return baseMapper.updateAccTeamMember(accTeamMember);
+    }
+
+    /**
+     * 批量删除团队成员
+     *
+     * @param ids 需要删除的团队成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccTeamMemberByIds(Long[] ids)
+    {
+        return baseMapper.deleteAccTeamMemberByIds(ids);
+    }
+
+    /**
+     * 删除团队成员信息
+     *
+     * @param id 团队成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccTeamMemberById(Long id)
+    {
+        return baseMapper.deleteAccTeamMemberById(id);
+    }
+
+
+
     @Override
     public R getUserTeamMember(Long activityId, Long teamId) {
         List<AccTeamMember> member=baseMapper.selectList(new LambdaQueryWrapper<AccTeamMember>()

+ 73 - 0
fs-service/src/main/java/com/fs/activity/service/impl/AccTeamServiceImpl.java

@@ -48,6 +48,79 @@ public class AccTeamServiceImpl extends ServiceImpl<AccTeamMapper, AccTeam>
 
     private final static Integer TEAM_MAX_MEMBER_COUNT = 26;
 
+
+    /**
+     * 查询团队
+     *
+     * @param id 团队主键
+     * @return 团队
+     */
+    @Override
+    public AccTeam selectAccTeamById(Long id)
+    {
+        return baseMapper.selectAccTeamById(id);
+    }
+
+    /**
+     * 查询团队列表
+     *
+     * @param accTeam 团队
+     * @return 团队
+     */
+    @Override
+    public List<AccTeam> selectAccTeamList(AccTeam accTeam)
+    {
+        return baseMapper.selectAccTeamList(accTeam);
+    }
+
+    /**
+     * 新增团队
+     *
+     * @param accTeam 团队
+     * @return 结果
+     */
+    @Override
+    public int insertAccTeam(AccTeam accTeam)
+    {
+        return baseMapper.insertAccTeam(accTeam);
+    }
+
+    /**
+     * 修改团队
+     *
+     * @param accTeam 团队
+     * @return 结果
+     */
+    @Override
+    public int updateAccTeam(AccTeam accTeam)
+    {
+        return baseMapper.updateAccTeam(accTeam);
+    }
+
+    /**
+     * 批量删除团队
+     *
+     * @param ids 需要删除的团队主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccTeamByIds(Long[] ids)
+    {
+        return baseMapper.deleteAccTeamByIds(ids);
+    }
+
+    /**
+     * 删除团队信息
+     *
+     * @param id 团队主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccTeamById(Long id)
+    {
+        return baseMapper.deleteAccTeamById(id);
+    }
+
     /**
      * @Description: 查询用户是否报名
      * @Param:

+ 75 - 0
fs-service/src/main/java/com/fs/activity/service/impl/AccVoteRecordServiceImpl.java

@@ -6,6 +6,8 @@ import com.fs.activity.service.AccVoteRecordService;
 import com.fs.activity.mapper.AccVoteRecordMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【acc_vote_record(投票记录表)】的数据库操作Service实现
@@ -15,6 +17,79 @@ import org.springframework.stereotype.Service;
 public class AccVoteRecordServiceImpl extends ServiceImpl<AccVoteRecordMapper, AccVoteRecord>
     implements AccVoteRecordService{
 
+    /**
+     * 查询投票记录
+     *
+     * @param id 投票记录主键
+     * @return 投票记录
+     */
+    @Override
+    public AccVoteRecord selectAccVoteRecordById(Long id)
+    {
+        return baseMapper.selectAccVoteRecordById(id);
+    }
+
+    /**
+     * 查询投票记录列表
+     *
+     * @param accVoteRecord 投票记录
+     * @return 投票记录
+     */
+    @Override
+    public List<AccVoteRecord> selectAccVoteRecordList(AccVoteRecord accVoteRecord)
+    {
+        return baseMapper.selectAccVoteRecordList(accVoteRecord);
+    }
+
+    /**
+     * 新增投票记录
+     *
+     * @param accVoteRecord 投票记录
+     * @return 结果
+     */
+    @Override
+    public int insertAccVoteRecord(AccVoteRecord accVoteRecord)
+    {
+        return baseMapper.insertAccVoteRecord(accVoteRecord);
+    }
+
+    /**
+     * 修改投票记录
+     *
+     * @param accVoteRecord 投票记录
+     * @return 结果
+     */
+    @Override
+    public int updateAccVoteRecord(AccVoteRecord accVoteRecord)
+    {
+        return baseMapper.updateAccVoteRecord(accVoteRecord);
+    }
+
+    /**
+     * 批量删除投票记录
+     *
+     * @param ids 需要删除的投票记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccVoteRecordByIds(Long[] ids)
+    {
+        return baseMapper.deleteAccVoteRecordByIds(ids);
+    }
+
+    /**
+     * 删除投票记录信息
+     *
+     * @param id 投票记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAccVoteRecordById(Long id)
+    {
+        return baseMapper.deleteAccVoteRecordById(id);
+    }
+
+
 }
 
 

+ 3 - 0
fs-service/src/main/java/com/fs/activity/service/impl/AccWorkServiceImpl.java

@@ -116,6 +116,9 @@ public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
     @Override
     public int updateAccWork(AccWork accWork)
     {
+        if(accWork.getStatus()!=null){
+            accWork.setAuditTime(new Date());
+        }
         return baseMapper.updateAccWork(accWork);
     }
 

+ 88 - 0
fs-service/src/main/resources/mapper/activity/AccTeamMapper.xml

@@ -38,4 +38,92 @@
         inner join acc_team_member m on t.id = m.team_id
         where m.user_id = #{userId} and m.activity_id = #{activityId}
     </select>
+
+    <sql id="selectAccTeamVo">
+        select id, activity_id, team_code, team_name, city, leader_id, leader_name, leader_phone, member_count, status, audit_remark, audit_time, created_at, updated_at from acc_team
+    </sql>
+
+    <select id="selectAccTeamList" parameterType="AccTeam" resultMap="BaseResultMap">
+        <include refid="selectAccTeamVo"/>
+        <where>
+            <if test="activityId != null "> and activity_id = #{activityId}</if>
+            <if test="teamCode != null  and teamCode != ''"> and team_code = #{teamCode}</if>
+            <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="leaderId != null "> and leader_id = #{leaderId}</if>
+            <if test="leaderName != null  and leaderName != ''"> and leader_name like concat('%', #{leaderName}, '%')</if>
+            <if test="leaderPhone != null  and leaderPhone != ''"> and leader_phone = #{leaderPhone}</if>
+            <if test="params.beginCreatedAt != null and params.beginCreatedAt != '' and params.endCreatedAt != null and params.endCreatedAt != ''"> and created_at &gt;= CONCAT( #{params.beginCreatedAt}, ' 00:00:00' ) and created_at &lt;= CONCAT( #{params.endCreatedAt}, ' 23:59:59' )</if>
+        </where>
+    </select>
+
+    <select id="selectAccTeamById" parameterType="Long" resultMap="BaseResultMap">
+        <include refid="selectAccTeamVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAccTeam" parameterType="AccTeam" useGeneratedKeys="true" keyProperty="id">
+        insert into acc_team
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="activityId != null">activity_id,</if>
+            <if test="teamCode != null and teamCode != ''">team_code,</if>
+            <if test="teamName != null and teamName != ''">team_name,</if>
+            <if test="city != null">city,</if>
+            <if test="leaderId != null">leader_id,</if>
+            <if test="leaderName != null and leaderName != ''">leader_name,</if>
+            <if test="leaderPhone != null and leaderPhone != ''">leader_phone,</if>
+            <if test="memberCount != null">member_count,</if>
+            <if test="status != null">status,</if>
+            <if test="auditRemark != null">audit_remark,</if>
+            <if test="auditTime != null">audit_time,</if>
+            <if test="createdAt != null">created_at,</if>
+            <if test="updatedAt != null">updated_at,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="activityId != null">#{activityId},</if>
+            <if test="teamCode != null and teamCode != ''">#{teamCode},</if>
+            <if test="teamName != null and teamName != ''">#{teamName},</if>
+            <if test="city != null">#{city},</if>
+            <if test="leaderId != null">#{leaderId},</if>
+            <if test="leaderName != null and leaderName != ''">#{leaderName},</if>
+            <if test="leaderPhone != null and leaderPhone != ''">#{leaderPhone},</if>
+            <if test="memberCount != null">#{memberCount},</if>
+            <if test="status != null">#{status},</if>
+            <if test="auditRemark != null">#{auditRemark},</if>
+            <if test="auditTime != null">#{auditTime},</if>
+            <if test="createdAt != null">#{createdAt},</if>
+            <if test="updatedAt != null">#{updatedAt},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAccTeam" parameterType="AccTeam">
+        update acc_team
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="activityId != null">activity_id = #{activityId},</if>
+            <if test="teamCode != null and teamCode != ''">team_code = #{teamCode},</if>
+            <if test="teamName != null and teamName != ''">team_name = #{teamName},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="leaderId != null">leader_id = #{leaderId},</if>
+            <if test="leaderName != null and leaderName != ''">leader_name = #{leaderName},</if>
+            <if test="leaderPhone != null and leaderPhone != ''">leader_phone = #{leaderPhone},</if>
+            <if test="memberCount != null">member_count = #{memberCount},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="auditRemark != null">audit_remark = #{auditRemark},</if>
+            <if test="auditTime != null">audit_time = #{auditTime},</if>
+            <if test="createdAt != null">created_at = #{createdAt},</if>
+            <if test="updatedAt != null">updated_at = #{updatedAt},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAccTeamById" parameterType="Long">
+        delete from acc_team where id = #{id}
+    </delete>
+
+    <delete id="deleteAccTeamByIds" parameterType="String">
+        delete from acc_team where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

+ 71 - 0
fs-service/src/main/resources/mapper/activity/AccTeamMemberMapper.xml

@@ -19,4 +19,75 @@
         id,team_id,user_id,user_name,join_time,status,
         created_at,updated_at
     </sql>
+
+    <sql id="selectAccTeamMemberVo">
+        select id, team_id, user_id, user_name, join_time, status, created_at, updated_at, activity_id from acc_team_member
+    </sql>
+
+    <select id="selectAccTeamMemberList" parameterType="AccTeamMember" resultMap="BaseResultMap">
+        <include refid="selectAccTeamMemberVo"/>
+        <where>
+            <if test="teamId != null "> and team_id = #{teamId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="createdAt != null "> and created_at = #{createdAt}</if>
+            <if test="activityId != null "> and activity_id = #{activityId}</if>
+            <if test="params.beginCreatedAt != null and params.beginCreatedAt != '' and params.endCreatedAt != null and params.endCreatedAt != ''"> and created_at &gt;= CONCAT( #{params.beginCreatedAt}, ' 00:00:00' ) and created_at &lt;= CONCAT( #{params.endCreatedAt}, ' 23:59:59' )</if>
+        </where>
+    </select>
+
+    <select id="selectAccTeamMemberById" parameterType="Long" resultMap="BaseResultMap">
+        <include refid="selectAccTeamMemberVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAccTeamMember" parameterType="AccTeamMember" useGeneratedKeys="true" keyProperty="id">
+        insert into acc_team_member
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="teamId != null">team_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="joinTime != null">join_time,</if>
+            <if test="status != null">status,</if>
+            <if test="createdAt != null">created_at,</if>
+            <if test="updatedAt != null">updated_at,</if>
+            <if test="activityId != null">activity_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="teamId != null">#{teamId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="joinTime != null">#{joinTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createdAt != null">#{createdAt},</if>
+            <if test="updatedAt != null">#{updatedAt},</if>
+            <if test="activityId != null">#{activityId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAccTeamMember" parameterType="AccTeamMember">
+        update acc_team_member
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="teamId != null">team_id = #{teamId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="joinTime != null">join_time = #{joinTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createdAt != null">created_at = #{createdAt},</if>
+            <if test="updatedAt != null">updated_at = #{updatedAt},</if>
+            <if test="activityId != null">activity_id = #{activityId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAccTeamMemberById" parameterType="Long">
+        delete from acc_team_member where id = #{id}
+    </delete>
+
+    <delete id="deleteAccTeamMemberByIds" parameterType="String">
+        delete from acc_team_member where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

+ 63 - 0
fs-service/src/main/resources/mapper/activity/AccVoteRecordMapper.xml

@@ -18,4 +18,67 @@
         id,work_id,user_id,vote_date,vote_time,ip_address,
         created_at
     </sql>
+
+    <sql id="selectAccVoteRecordVo">
+        select id, work_id, user_id, vote_date, vote_time, ip_address, created_at from acc_vote_record
+    </sql>
+
+    <select id="selectAccVoteRecordList" parameterType="AccVoteRecord" resultMap="BaseResultMap">
+        <include refid="selectAccVoteRecordVo"/>
+        <where>
+            <if test="workId != null "> and work_id = #{workId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="voteTime != null "> and vote_time = #{voteTime}</if>
+            <if test="ipAddress != null  and ipAddress != ''"> and ip_address = #{ipAddress}</if>
+        </where>
+    </select>
+
+    <select id="selectAccVoteRecordById" parameterType="Long" resultMap="BaseResultMap">
+        <include refid="selectAccVoteRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAccVoteRecord" parameterType="AccVoteRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into acc_vote_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workId != null">work_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="voteDate != null">vote_date,</if>
+            <if test="voteTime != null">vote_time,</if>
+            <if test="ipAddress != null">ip_address,</if>
+            <if test="createdAt != null">created_at,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workId != null">#{workId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="voteDate != null">#{voteDate},</if>
+            <if test="voteTime != null">#{voteTime},</if>
+            <if test="ipAddress != null">#{ipAddress},</if>
+            <if test="createdAt != null">#{createdAt},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAccVoteRecord" parameterType="AccVoteRecord">
+        update acc_vote_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="workId != null">work_id = #{workId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="voteDate != null">vote_date = #{voteDate},</if>
+            <if test="voteTime != null">vote_time = #{voteTime},</if>
+            <if test="ipAddress != null">ip_address = #{ipAddress},</if>
+            <if test="createdAt != null">created_at = #{createdAt},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAccVoteRecordById" parameterType="Long">
+        delete from acc_vote_record where id = #{id}
+    </delete>
+
+    <delete id="deleteAccVoteRecordByIds" parameterType="String">
+        delete from acc_vote_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

+ 2 - 2
fs-service/src/main/resources/mapper/activity/AccWorkMapper.xml

@@ -39,8 +39,8 @@
             <if test="activityId != null "> and activity_id = #{activityId}</if>
             <if test="workName != null  and workName != ''"> and work_name like concat('%', #{workName}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="params.beginAuditTime != null  and params.endAuditTime != null "> and audit_time between #{params.beginAuditTime} and #{params.endAuditTime}</if>
-            <if test="params.beginCreatedAt != null  and params.endCreatedAt != null "> and created_at between #{params.beginCreatedAt} and #{params.endCreatedAt}</if>
+            <if test="params.beginAuditTime != null  and params.endAuditTime != null "> and audit_time &gt;= CONCAT( #{params.beginAuditTime}, ' 00:00:00' ) and audit_time &lt;= CONCAT( #{params.endAuditTime}, ' 23:59:59' )</if>
+            <if test="params.beginCreatedAt != null  and params.endCreatedAt != null "> and created_at &gt;= CONCAT( #{params.beginCreatedAt}, ' 00:00:00' ) and created_at &lt;= CONCAT( #{params.endCreatedAt}, ' 23:59:59' )</if>
         </where>
     </select>