From 786a0589ded81ad2adb48af9fb47002f06ef504b Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Wed, 11 Dec 2024 11:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E6=88=90,=20=E4=BD=9C=E5=93=81=E5=AE=A1=E6=A0=B8=E5=89=A9?= =?UTF-8?q?=E4=B8=8B=E5=AE=A1=E6=A0=B8=E9=83=A8=E5=88=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/SysBackUserController.java | 85 +++++++--- .../backstage/SysWorkReviewController.java | 160 ++++++++++++++++++ .../controller/WorkReviewController.java | 104 ++++++++++++ .../com/ruoyi/system/domain/WorkReview.java | 122 +++++++++++++ .../ruoyi/system/domain/dto/SysIncomeDto.java | 26 +++ .../system/domain/dto/UserWorkCountDto.java | 27 +++ .../system/domain/dto/UserWorkReviewDto.java | 142 ++++++++++++++++ .../ruoyi/system/mapper/DailySysMapper.java | 3 + .../ruoyi/system/mapper/SysUserMapper.java | 2 +- .../system/mapper/SysUserRoleMapper.java | 2 + .../ruoyi/system/mapper/UserInfoMapper.java | 4 +- .../ruoyi/system/mapper/UserWorkMapper.java | 10 +- .../ruoyi/system/mapper/WorkReviewMapper.java | 61 +++++++ .../system/service/IDailySysService.java | 6 + .../ruoyi/system/service/ISysRoleService.java | 6 + .../ruoyi/system/service/ISysUserService.java | 2 +- .../system/service/ISysUserStService.java | 2 + .../system/service/IUserInfoService.java | 4 +- .../system/service/IUserWorkService.java | 9 +- .../system/service/IWorkReviewService.java | 61 +++++++ .../service/impl/DailySysServiceImpl.java | 6 + .../service/impl/SysRoleServiceImpl.java | 9 + .../impl/SysUserOnlineTimeServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 4 +- .../impl/SysUserWorkCountServiceImpl.java | 2 +- .../service/impl/UserInfoServiceImpl.java | 6 +- .../service/impl/UserWorkServiceImpl.java | 11 +- .../service/impl/WorkReviewServiceImpl.java | 95 +++++++++++ .../mapper/system/DailySysMapper.xml | 10 +- .../resources/mapper/system/SysUserMapper.xml | 5 +- .../mapper/system/SysUserRoleMapper.xml | 7 +- .../mapper/system/UserInfoMapper.xml | 6 +- .../mapper/system/UserWorkMapper.xml | 47 +++++ .../mapper/system/WorkReviewMapper.xml | 85 ++++++++++ 34 files changed, 1092 insertions(+), 41 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/WorkReviewController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/WorkReview.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysIncomeDto.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkCountDto.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkReviewDto.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/WorkReviewMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IWorkReviewService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WorkReviewServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/WorkReviewMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysBackUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysBackUserController.java index 62bb22fb..338cd269 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysBackUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysBackUserController.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.UserInfo; import com.ruoyi.system.domain.dto.BackstageUserDto; import com.ruoyi.system.domain.vo.UserManagerVo; @@ -42,7 +43,7 @@ import static com.ruoyi.common.utils.PageUtils.startPage; @RestController @RequestMapping("/system/user") -public class SysBackUserController { +public class SysBackUserController extends BaseController { @Autowired private ISysUserService userService; @@ -67,7 +68,7 @@ public class SysBackUserController { public TableDataInfo backlist(SysUser user) { startPage(); - List list = userService.getBackstageUserList(); + List list = userService.getBackstageUserList(user); return getDataTable(list); } @@ -192,6 +193,7 @@ public class SysBackUserController { * */ @PreAuthorize("@ss.hasPermi('system:user:edit')") @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @Transactional @PutMapping("/updateBackstageUser") public AjaxResult updateBackstageUser(@RequestBody BackstageUserDto backstageUserDto){ @@ -202,21 +204,44 @@ public class SysBackUserController { //---------------------------------------修改用户角色------------------------------------------------- // 根据角色名查角色id Long roleId = roleService.selectRoleIdByRoleName(userRole); - int roleFlag = roleService.updateUserRole(userId, roleId); - if(roleFlag == 0){ - return AjaxResult.error("修改用户角色失败,请联系管理员"); + System.out.println("角色id: "+ roleId); + + // 先查一下该用户是否已经有角色 + SysUserRole sysUserRole = roleService.getSysUserRole(userId); + + if (sysUserRole == null){ + + System.out.println("该用户没有角色, 在修改时添加角色"); + // 新增用户角色 + int roleFlag = roleService.insertSysUserRole(userId, roleId); + if (roleFlag == 0){ + return AjaxResult.error("修改用户角色失败,请联系管理员1"); + } } + else{ + System.out.println("该用户已经有角色, 在修改时修改角色"); + roleService.updateUserRole(userId, roleId); + } + + + + // 貌似角色不修改默认返回的就是0?? +// if(roleFlag == 0){ +// return AjaxResult.error("修改用户角色失败,请联系管理员0"); +// } //--------------------------------------修改用户角色结束---------------------------------------------- //修改用户状态 SysUser sysUser = new SysUser(); sysUser.setUserId(userId); sysUser.setStatus(userStatus); - int statusFlag = userService.updateUserStatus(sysUser); - if (statusFlag == 0){ - return AjaxResult.error("修改用户状态失败,请联系管理员"); - } + + + // 若是不修改返回也是0啊 +// if (statusFlag == 0){ +// return AjaxResult.error("修改用户状态失败,请联系管理员1"); +// } return AjaxResult.success("修改用户账号信息成功"); } @@ -228,24 +253,38 @@ public class SysBackUserController { @Log(title = "系统管理--人员管理--删除后台用户", businessType = BusinessType.DELETE) // 删除后台用户 @DeleteMapping("/deleteUser/{userId}") - public AjaxResult deleteBackstageUser(@PathVariable Long userId){ + public AjaxResult deleteBackstageUser(@PathVariable Long[] userId){ - int back = userService.deleteUserById(userId); - if(back > 0){ - return AjaxResult.success("删除用户成功"); + //删除多个用户 + Long authId = SecurityUtils.getUserId(); + if (ArrayUtils.contains(userId, authId)) + { + return AjaxResult.error("当前用户不能删除"); } - return AjaxResult.error("删除用户失败"); + + return toAjax(userService.deleteUserByIds(userId)); + + + + //删除单个用户 +// int back = userService.deleteUserById(userId); +// if(back > 0){ +// return AjaxResult.success("删除用户成功"); +// } +// return AjaxResult.error("删除用户失败"); } - private TableDataInfo getDataTable(List list) - { - TableDataInfo rspData = new TableDataInfo(); - rspData.setCode(HttpStatus.SUCCESS); - rspData.setMsg("查询成功"); - rspData.setRows(list); - rspData.setTotal(new PageInfo(list).getTotal()); - return rspData; - } + + +// private TableDataInfo getDataTable(List list) +// { +// TableDataInfo rspData = new TableDataInfo(); +// rspData.setCode(HttpStatus.SUCCESS); +// rspData.setMsg("查询成功"); +// rspData.setRows(list); +// rspData.setTotal(new PageInfo(list).getTotal()); +// return rspData; +// } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java new file mode 100644 index 00000000..c75683ba --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java @@ -0,0 +1,160 @@ +package com.ruoyi.web.controller.backstage; + + +import com.github.pagehelper.PageInfo; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.domain.UserWork; +import com.ruoyi.system.domain.dto.SeOnlineTimeDto; +import com.ruoyi.system.domain.dto.SeUserWorkCountDto; +import com.ruoyi.system.domain.dto.UserWorkReviewDto; +import com.ruoyi.system.service.IDailySysService; +import com.ruoyi.system.service.ISysUserStService; +import com.ruoyi.system.service.IUserWorkService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +//import static com.ruoyi.common.core.domain.AjaxResult.error; +//import static com.ruoyi.common.utils.PageUtils.startPage; + + +// 内容审核后台管理 +@RestController +@RequestMapping("/system/work") +public class SysWorkReviewController extends BaseController { + + @Autowired + private IUserWorkService userWorkService; + + // 系统每天统计数据 + @Autowired + private IDailySysService dailySysService; + + + /* + * 获取过审总数--workStatus=3 + 获取未审总数--workStatus=2 + * */ + //未申总数 + //过审总数 + //退回总数 workStatus=5 + //所有总数 workStatus=null + + // 获取所有作品数量统计数据 + @GetMapping("/getStWorkCount") + public AjaxResult getStWorkCount(){ + //作品总数 + Long tCount = userWorkService.getUserWorkCount(null); + + //过审总数 + Long passCount = userWorkService.getUserWorkCount("3"); + + // 未审总数 + Long waitCount = userWorkService.getUserWorkCount("2"); + + // 退回总数 + Long unPassCount = userWorkService.getUserWorkCount("5"); + + AjaxResult ajax = AjaxResult.success(); + ajax.put("tCount", tCount); + ajax.put("passCount", passCount); + ajax.put("waitCount", waitCount); + ajax.put("unPassCount", unPassCount); + + return ajax; + } + +// //----------------------------------------------------废弃--------------------------------------------------------- +// @GetMapping("/getAllWorkCount") +// public AjaxResult getAllWorkCount(){ +// Long count = userWorkService.getUserWorkCount(null); +// +// return success(count); +// } +// +// @GetMapping("/getAllWorkCount/{workStatus}") +// public AjaxResult getWorkCount(@PathVariable String workStatus){ +// System.out.println("作品状态: "+ workStatus); +// Long count = userWorkService.getUserWorkCount(workStatus); +// +// return success(count); +// } +// //----------------------------------------------------废弃结束---------------------------------------------------------- + + + + + //获取指定天数的用户作品总量 + @GetMapping("/getDayWorkCount/{day}") + public AjaxResult getDayWorkCount(@PathVariable int day){ + LocalDate now = LocalDate.now(); + LocalDate startDate = now.minusDays(day+1); + LocalDate endDate = now.minusDays(1); + +// // 实际要返回的方法 +// List seUserWorkCount = dailySysService.getSeUserWorkCount(startDate, endDate); + + //-----------------------测试保证返回数组的长度为day----------------------- + List seUserWorkCount = new ArrayList<>(); + for(int i=0;i userWorkList = userWorkService.getAllUserWork(userWork); + for(UserWorkReviewDto userWorkReviewDto:userWorkList){ + userWorkReviewDto.setSource(userWorkReviewDto.getCity()+userWorkReviewDto.getScenic()+userWorkReviewDto.getPart()); + } + return getDataTable(userWorkList); + + } + + // 根据作品id获取作品详情 + @GetMapping("/getUserWork/{workId}") + public AjaxResult getUserWork(@PathVariable Long workId){ + UserWork userWork = userWorkService.selectUserWorkByWorkId(workId); + return success(userWork); + } + + // 审核 + // 查看作品详情 + + + + + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/WorkReviewController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/WorkReviewController.java new file mode 100644 index 00000000..96cd50ba --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/WorkReviewController.java @@ -0,0 +1,104 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.WorkReview; +import com.ruoyi.system.service.IWorkReviewService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 作品评审意见Controller + * + * @author haotian + * @date 2024-12-11 + */ +@RestController +@RequestMapping("/system/review") +public class WorkReviewController extends BaseController +{ + @Autowired + private IWorkReviewService workReviewService; + + /** + * 查询作品评审意见列表 + */ + @PreAuthorize("@ss.hasPermi('system:review:list')") + @GetMapping("/list") + public TableDataInfo list(WorkReview workReview) + { + startPage(); + List list = workReviewService.selectWorkReviewList(workReview); + return getDataTable(list); + } + + /** + * 导出作品评审意见列表 + */ + @PreAuthorize("@ss.hasPermi('system:review:export')") + @Log(title = "作品评审意见", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WorkReview workReview) + { + List list = workReviewService.selectWorkReviewList(workReview); + ExcelUtil util = new ExcelUtil(WorkReview.class); + util.exportExcel(response, list, "作品评审意见数据"); + } + + /** + * 获取作品评审意见详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:review:query')") + @GetMapping(value = "/{reviewId}") + public AjaxResult getInfo(@PathVariable("reviewId") Long reviewId) + { + return success(workReviewService.selectWorkReviewByReviewId(reviewId)); + } + + /** + * 新增作品评审意见 + */ + @PreAuthorize("@ss.hasPermi('system:review:add')") + @Log(title = "作品评审意见", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WorkReview workReview) + { + return toAjax(workReviewService.insertWorkReview(workReview)); + } + + /** + * 修改作品评审意见 + */ + @PreAuthorize("@ss.hasPermi('system:review:edit')") + @Log(title = "作品评审意见", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WorkReview workReview) + { + return toAjax(workReviewService.updateWorkReview(workReview)); + } + + /** + * 删除作品评审意见 + */ + @PreAuthorize("@ss.hasPermi('system:review:remove')") + @Log(title = "作品评审意见", businessType = BusinessType.DELETE) + @DeleteMapping("/{reviewIds}") + public AjaxResult remove(@PathVariable Long[] reviewIds) + { + return toAjax(workReviewService.deleteWorkReviewByReviewIds(reviewIds)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WorkReview.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WorkReview.java new file mode 100644 index 00000000..f7bff114 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WorkReview.java @@ -0,0 +1,122 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 作品评审意见对象 work_review + * + * @author haotian + * @date 2024-12-11 + */ +public class WorkReview extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 评审意见id */ + private Long reviewId; + + /** 作品id */ + @Excel(name = "作品id") + private Long workId; + + /** 评审人id */ + @Excel(name = "评审人id") + private Long reviewerId; + + /** 评审人昵称 */ + @Excel(name = "评审人昵称") + private String reviewerName; + + /** 评审结果 */ + @Excel(name = "评审结果") + private String workStatus; + + /** 反馈详情 */ + @Excel(name = "反馈详情") + private String detail; + + /** a.0 */ + @Excel(name = "a.0") + private String deleteFlag; + + public void setReviewId(Long reviewId) + { + this.reviewId = reviewId; + } + + public Long getReviewId() + { + return reviewId; + } + public void setWorkId(Long workId) + { + this.workId = workId; + } + + public Long getWorkId() + { + return workId; + } + public void setReviewerId(Long reviewerId) + { + this.reviewerId = reviewerId; + } + + public Long getReviewerId() + { + return reviewerId; + } + public void setReviewerName(String reviewerName) + { + this.reviewerName = reviewerName; + } + + public String getReviewerName() + { + return reviewerName; + } + public void setWorkStatus(String workStatus) + { + this.workStatus = workStatus; + } + + public String getWorkStatus() + { + return workStatus; + } + public void setDetail(String detail) + { + this.detail = detail; + } + + public String getDetail() + { + return detail; + } + public void setDeleteFlag(String deleteFlag) + { + this.deleteFlag = deleteFlag; + } + + public String getDeleteFlag() + { + return deleteFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("reviewId", getReviewId()) + .append("workId", getWorkId()) + .append("createTime", getCreateTime()) + .append("reviewerId", getReviewerId()) + .append("reviewerName", getReviewerName()) + .append("workStatus", getWorkStatus()) + .append("detail", getDetail()) + .append("deleteFlag", getDeleteFlag()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysIncomeDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysIncomeDto.java new file mode 100644 index 00000000..ca6fd829 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysIncomeDto.java @@ -0,0 +1,26 @@ +package com.ruoyi.system.domain.dto; + +import java.time.LocalDate; + +public class SysIncomeDto { + + private Long tIncome; + private LocalDate date; + + public Long gettIncome() { + return tIncome; + } + + public void settIncome(Long tIncome) { + this.tIncome = tIncome; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkCountDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkCountDto.java new file mode 100644 index 00000000..b0ef08a5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkCountDto.java @@ -0,0 +1,27 @@ +package com.ruoyi.system.domain.dto; + +import java.time.LocalDate; +//import java.util.Date; + +public class UserWorkCountDto { + + private Long workCount; + private LocalDate date; + + public Long getWorkCount() { + return workCount; + } + + public void settWork(Long tWork) { + this.workCount = tWork; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkReviewDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkReviewDto.java new file mode 100644 index 00000000..fcd35c40 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserWorkReviewDto.java @@ -0,0 +1,142 @@ +package com.ruoyi.system.domain.dto; + + +import java.util.Date; + +// 内容审核中获取作品列表的参数 +public class UserWorkReviewDto { + + private Long workId; + private String workAddress; + private String workName; + private String detail; + + // 作品所有者的用户名 + private String nickName; + + // 资源位 + private Long sourceId; + + private String city; + + private String scenic; + + private String part; + + private String source; + + // 作品审核状态 + private String workStatus; + + // 审核记录 + private String auditOpinion; + + //创建时间 + private Date createTime; + + public Long getWorkId() { + return workId; + } + + public void setWorkId(Long workId) { + this.workId = workId; + } + + public String getWorkAddress() { + return workAddress; + } + + public void setWorkAddress(String workAddress) { + this.workAddress = workAddress; + } + + public String getWorkName() { + return workName; + } + + public void setWorkName(String workName) { + this.workName = workName; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public Long getSourceId() { + return sourceId; + } + + public void setSourceId(Long sourceId) { + this.sourceId = sourceId; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getScenic() { + return scenic; + } + + public void setScenic(String scenic) { + this.scenic = scenic; + } + + public String getPart() { + return part; + } + + public void setPart(String part) { + this.part = part; + } + + public String getWorkStatus() { + return workStatus; + } + + public void setWorkStatus(String workStatus) { + this.workStatus = workStatus; + } + + public String getAuditOpinion() { + return auditOpinion; + } + + public void setAuditOpinion(String auditOpinion) { + this.auditOpinion = auditOpinion; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DailySysMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DailySysMapper.java index 70d46133..7b62aa9d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DailySysMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DailySysMapper.java @@ -6,6 +6,7 @@ import com.ruoyi.system.domain.DailySys; import com.ruoyi.system.domain.dto.SeOnlineTimeDto; import com.ruoyi.system.domain.dto.SeUserCountDto; import com.ruoyi.system.domain.dto.SeUserWorkCountDto; +import com.ruoyi.system.domain.dto.SysIncomeDto; import org.apache.ibatis.annotations.Param; /** @@ -40,6 +41,8 @@ public interface DailySysMapper public List gettOnlineTime(@Param("startDate")LocalDate startDate, @Param("endDate") LocalDate endDate); + public List getSysIncome(@Param("startDate")LocalDate startDate, @Param("endDate") LocalDate endDate); + /** * 新增记录系统每天需要统计的任务 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 8ce9ed26..a9b69de4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -142,7 +142,7 @@ public interface SysUserMapper public Long getUserCount(); - public List getBackstageUserList(); + public List getBackstageUserList(SysUser user); public UserManagerVo getBackstageUserById(@Param("userId")Long userId); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index 461ff77a..488918a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -66,4 +66,6 @@ public interface SysUserRoleMapper * 更新用户角色 * */ public int updateUserRole(@Param("userId")Long userId, @Param("roleId") Long roleId); + + public SysUserRole getSysUserRole(@Param("userId") Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserInfoMapper.java index acb42663..e95ffe81 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserInfoMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.domain.UserInfo; import com.ruoyi.system.domain.vo.AppUserInfoVo; import org.apache.ibatis.annotations.Param; @@ -69,7 +71,7 @@ public interface UserInfoMapper public int updateBackground(@Param("phonenumber") String phonenumber, @Param("background") String background); - public List getAllAppUserInfo(); + public List getAllAppUserInfo(SysUser user); public AppUserInfoVo getAppUserInfo(@Param("userId") Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java index 88a78e71..084b9a63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.system.mapper; +import java.util.Date; import java.util.List; import com.ruoyi.system.domain.UserWork; +import com.ruoyi.system.domain.dto.UserWorkReviewDto; +import org.apache.ibatis.annotations.Param; /** * 用户作品Mapper接口 @@ -59,5 +62,10 @@ public interface UserWorkMapper */ public int deleteUserWorkByWorkIds(Long[] workIds); - public Long getUserWorkCount(); + public Long getUserWorkCount(@Param("workStatus") String workStatus); + + /* + * 内容审核获取用户作品列表 + * */ + public List getAllUserWork(UserWork userWork); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WorkReviewMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WorkReviewMapper.java new file mode 100644 index 00000000..2b13153f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WorkReviewMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.WorkReview; + +/** + * 作品评审意见Mapper接口 + * + * @author haotian + * @date 2024-12-11 + */ +public interface WorkReviewMapper +{ + /** + * 查询作品评审意见 + * + * @param reviewId 作品评审意见主键 + * @return 作品评审意见 + */ + public WorkReview selectWorkReviewByReviewId(Long reviewId); + + /** + * 查询作品评审意见列表 + * + * @param workReview 作品评审意见 + * @return 作品评审意见集合 + */ + public List selectWorkReviewList(WorkReview workReview); + + /** + * 新增作品评审意见 + * + * @param workReview 作品评审意见 + * @return 结果 + */ + public int insertWorkReview(WorkReview workReview); + + /** + * 修改作品评审意见 + * + * @param workReview 作品评审意见 + * @return 结果 + */ + public int updateWorkReview(WorkReview workReview); + + /** + * 删除作品评审意见 + * + * @param reviewId 作品评审意见主键 + * @return 结果 + */ + public int deleteWorkReviewByReviewId(Long reviewId); + + /** + * 批量删除作品评审意见 + * + * @param reviewIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWorkReviewByReviewIds(Long[] reviewIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDailySysService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDailySysService.java index 7889e8fd..95b297cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDailySysService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDailySysService.java @@ -6,6 +6,7 @@ import com.ruoyi.system.domain.DailySys; import com.ruoyi.system.domain.dto.SeOnlineTimeDto; import com.ruoyi.system.domain.dto.SeUserCountDto; import com.ruoyi.system.domain.dto.SeUserWorkCountDto; +import com.ruoyi.system.domain.dto.SysIncomeDto; /** * 记录系统每天需要统计的任务Service接口 @@ -44,8 +45,13 @@ public interface IDailySysService //获取指定起止时间内的每天作品总数 public List getSeUserWorkCount(LocalDate startDate, LocalDate endDate); + //获取指定起止时间内的每天在线时长 public List gettOnlineTime(LocalDate startDate, LocalDate endDate); + //获取指定起止时间内的每天收入总额 + public List getSysIncome(LocalDate startDate, LocalDate endDate); + + /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index e2e09d12..85ab3a1d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -186,4 +186,10 @@ public interface ISysRoleService * 更新用户角色 * */ public int updateUserRole(Long userId, Long roleId); + + /* + * 查询sys_user_role 中是否存在相应的数据 + * */ + + public SysUserRole getSysUserRole(Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index f7067caf..9caa8f30 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -231,7 +231,7 @@ public interface ISysUserService * 人员管理----获取系统后台用户 * */ - public List getBackstageUserList(); + public List getBackstageUserList(SysUser user); /* * 人员管理---根据user_id获取后台用户信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserStService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserStService.java index 926973e9..f9ba5f1a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserStService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserStService.java @@ -19,4 +19,6 @@ public interface ISysUserStService { + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserInfoService.java index 6e22a735..51aa7c65 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserInfoService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.domain.UserInfo; import com.ruoyi.system.domain.vo.AppUserInfoVo; @@ -82,7 +84,7 @@ public interface IUserInfoService /*获取所用App用户的信息*/ - public List getAllAppUserInfo(); + public List getAllAppUserInfo(SysUser user); /* * 根据用户id获取指定App用户的信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java index 93a0e214..aca43b6b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java @@ -1,7 +1,9 @@ package com.ruoyi.system.service; +import java.util.Date; import java.util.List; import com.ruoyi.system.domain.UserWork; +import com.ruoyi.system.domain.dto.UserWorkReviewDto; /** * 用户作品Service接口 @@ -59,5 +61,10 @@ public interface IUserWorkService */ public int deleteUserWorkByWorkId(Long workId); - public Long getUserWorkCount(); + public Long getUserWorkCount(String workStatus); + + /* + * 内容审核获取用户作品列表 + * */ + public List getAllUserWork(UserWork userWork); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IWorkReviewService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IWorkReviewService.java new file mode 100644 index 00000000..04e0b9ce --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IWorkReviewService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.WorkReview; + +/** + * 作品评审意见Service接口 + * + * @author haotian + * @date 2024-12-11 + */ +public interface IWorkReviewService +{ + /** + * 查询作品评审意见 + * + * @param reviewId 作品评审意见主键 + * @return 作品评审意见 + */ + public WorkReview selectWorkReviewByReviewId(Long reviewId); + + /** + * 查询作品评审意见列表 + * + * @param workReview 作品评审意见 + * @return 作品评审意见集合 + */ + public List selectWorkReviewList(WorkReview workReview); + + /** + * 新增作品评审意见 + * + * @param workReview 作品评审意见 + * @return 结果 + */ + public int insertWorkReview(WorkReview workReview); + + /** + * 修改作品评审意见 + * + * @param workReview 作品评审意见 + * @return 结果 + */ + public int updateWorkReview(WorkReview workReview); + + /** + * 批量删除作品评审意见 + * + * @param reviewIds 需要删除的作品评审意见主键集合 + * @return 结果 + */ + public int deleteWorkReviewByReviewIds(Long[] reviewIds); + + /** + * 删除作品评审意见信息 + * + * @param reviewId 作品评审意见主键 + * @return 结果 + */ + public int deleteWorkReviewByReviewId(Long reviewId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DailySysServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DailySysServiceImpl.java index 9e40c03a..64adb7ab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DailySysServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DailySysServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import com.ruoyi.system.domain.dto.SeOnlineTimeDto; import com.ruoyi.system.domain.dto.SeUserCountDto; import com.ruoyi.system.domain.dto.SeUserWorkCountDto; +import com.ruoyi.system.domain.dto.SysIncomeDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.DailySysMapper; @@ -72,6 +73,11 @@ public class DailySysServiceImpl implements IDailySysService return dailySysMapper.gettOnlineTime(startDate, endDate); } + @Override + public List getSysIncome(LocalDate startDate, LocalDate endDate){ + return dailySysMapper.getSysIncome(startDate, endDate); + } + /** * 新增记录系统每天需要统计的任务 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index f8677392..b9f2a27a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -444,4 +444,13 @@ public class SysRoleServiceImpl implements ISysRoleService public int updateUserRole(Long userId, Long roleId){ return userRoleMapper.updateUserRole(userId, roleId); } + + + /* + * 查询sys_user_role 中是否存在相应的数据 + * */ + @Override + public SysUserRole getSysUserRole(Long userId){ + return userRoleMapper.getSysUserRole(userId); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineTimeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineTimeServiceImpl.java index 0a9f39a8..02dc6d6a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineTimeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineTimeServiceImpl.java @@ -191,7 +191,7 @@ public class SysUserOnlineTimeServiceImpl implements ISysUserOnlineTimeService { // System.out.println("定时任务输出"+date); // } // 每天凌晨 1 点计算近7/30天的在线时长 - @Scheduled(cron="0 0 1 * * ?") +// @Scheduled(cron="0 0 1 * * ?") // @Scheduled(cron="0 * * * * ?") @Override public void calculateUserOnlineStats() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index aeacbac8..daa5f63a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -583,8 +583,8 @@ public class SysUserServiceImpl implements ISysUserService } @Override - public List getBackstageUserList(){ - return userMapper.getBackstageUserList(); + public List getBackstageUserList(SysUser user){ + return userMapper.getBackstageUserList(user); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserWorkCountServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserWorkCountServiceImpl.java index ba1527a1..d8bc058e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserWorkCountServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserWorkCountServiceImpl.java @@ -24,7 +24,7 @@ public class SysUserWorkCountServiceImpl implements ISysUserWorkCountService { @Override public Long getUserWorkCount() { - Long userWorkCount = userWorkService.getUserWorkCount(); + Long userWorkCount = userWorkService.getUserWorkCount(null); return userWorkCount; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java index 0a50377b..bfacb874 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import java.util.List; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.domain.vo.AppUserInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -122,8 +123,9 @@ public class UserInfoServiceImpl implements IUserInfoService } @Override - public List getAllAppUserInfo(){ - return userInfoMapper.getAllAppUserInfo(); + public List getAllAppUserInfo(SysUser user){ + + return userInfoMapper.getAllAppUserInfo(user); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java index b25cc07e..b457a3af 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.system.service.impl; +import java.util.Date; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.system.domain.dto.UserWorkReviewDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.UserWorkMapper; @@ -94,8 +96,13 @@ public class UserWorkServiceImpl implements IUserWorkService } @Override - public Long getUserWorkCount() + public Long getUserWorkCount(String workStatus) { - return userWorkMapper.getUserWorkCount(); + return userWorkMapper.getUserWorkCount(workStatus); + } + + @Override + public List getAllUserWork(UserWork userWork ){ + return userWorkMapper.getAllUserWork(userWork); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WorkReviewServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WorkReviewServiceImpl.java new file mode 100644 index 00000000..a594c569 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WorkReviewServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.WorkReviewMapper; +import com.ruoyi.system.domain.WorkReview; +import com.ruoyi.system.service.IWorkReviewService; + +/** + * 作品评审意见Service业务层处理 + * + * @author haotian + * @date 2024-12-11 + */ +@Service +public class WorkReviewServiceImpl implements IWorkReviewService +{ + @Autowired + private WorkReviewMapper workReviewMapper; + + /** + * 查询作品评审意见 + * + * @param reviewId 作品评审意见主键 + * @return 作品评审意见 + */ + @Override + public WorkReview selectWorkReviewByReviewId(Long reviewId) + { + return workReviewMapper.selectWorkReviewByReviewId(reviewId); + } + + /** + * 查询作品评审意见列表 + * + * @param workReview 作品评审意见 + * @return 作品评审意见 + */ + @Override + public List selectWorkReviewList(WorkReview workReview) + { + return workReviewMapper.selectWorkReviewList(workReview); + } + + /** + * 新增作品评审意见 + * + * @param workReview 作品评审意见 + * @return 结果 + */ + @Override + public int insertWorkReview(WorkReview workReview) + { + workReview.setCreateTime(DateUtils.getNowDate()); + return workReviewMapper.insertWorkReview(workReview); + } + + /** + * 修改作品评审意见 + * + * @param workReview 作品评审意见 + * @return 结果 + */ + @Override + public int updateWorkReview(WorkReview workReview) + { + return workReviewMapper.updateWorkReview(workReview); + } + + /** + * 批量删除作品评审意见 + * + * @param reviewIds 需要删除的作品评审意见主键 + * @return 结果 + */ + @Override + public int deleteWorkReviewByReviewIds(Long[] reviewIds) + { + return workReviewMapper.deleteWorkReviewByReviewIds(reviewIds); + } + + /** + * 删除作品评审意见信息 + * + * @param reviewId 作品评审意见主键 + * @return 结果 + */ + @Override + public int deleteWorkReviewByReviewId(Long reviewId) + { + return workReviewMapper.deleteWorkReviewByReviewId(reviewId); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml index 23b69dee..2d62d540 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml @@ -35,6 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + select daily_sys_id, t_user, t_online_time, t_mr_time, t_bought, t_interactions, t_shares, t_work, t_pass_work, t_back_work, t_income, t_refund, data from daily_sys @@ -80,7 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t_online_time, data from daily_sys where data between #{startDate} and #{endDate} - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 6a3d359c..aa50847a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -188,13 +188,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join user_info on sys_user.user_id = user_info.user_id where sys_user.user_type != '0000000000' - select u.user_id, u.nick_name, u.phonenumber, u.create_time ,i.real_name, sr.role_name, u.status from sys_user u left join user_info i on u.user_id = i.user_id left join sys_user_role r on u.user_id = r.user_id left join sys_role sr on r.role_id = sr.role_id where u.user_type != '0000000000' + + AND u.nick_name like concat('%', #{nickName}, '%') + select count(1) from sys_user_role where role_id=#{roleId} - + + delete from sys_user_role where user_id in diff --git a/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml index c35b7d7d..4dc17883 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml @@ -97,12 +97,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select s.user_id, s.nick_name, s.status, s.create_time, u.receive_rockets, u.send_rockets, u.followers, u.s_online_time, u.s_mr_time, u.s_consumption, u.th_consumption, u.phonenumber, u.t_mr_time, u.t_online_time, u.t_consumption from sys_user s left join user_info u on s.user_id = u.user_id where s.user_type = '0000000000' + + AND s.status = #{status} + AND s.nick_name like concat('%', #{nickName}, '%') + select count(*) from user_work + + and work_status = #{workStatus} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/WorkReviewMapper.xml b/ruoyi-system/src/main/resources/mapper/system/WorkReviewMapper.xml new file mode 100644 index 00000000..ad51f9b2 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/WorkReviewMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + select review_id, work_id, create_time, reviewer_id, reviewer_name, work_status, detail, delete_flag from work_review + + + + + + + + insert into work_review + + work_id, + create_time, + reviewer_id, + reviewer_name, + work_status, + detail, + delete_flag, + + + #{workId}, + #{createTime}, + #{reviewerId}, + #{reviewerName}, + #{workStatus}, + #{detail}, + #{deleteFlag}, + + + + + update work_review + + work_id = #{workId}, + create_time = #{createTime}, + reviewer_id = #{reviewerId}, + reviewer_name = #{reviewerName}, + work_status = #{workStatus}, + detail = #{detail}, + delete_flag = #{deleteFlag}, + + where review_id = #{reviewId} + + + + delete from work_review where review_id = #{reviewId} + + + + delete from work_review where review_id in + + #{reviewId} + + + \ No newline at end of file