From 8871de88b3c51b3ba791791b78fd568c5cfc9f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 14 Sep 2020 10:19:03 +0800 Subject: [PATCH] fix --- src/main/java/com/lz/config/ShiroConfig.java | 1 + .../controller/ReportResultController.java | 51 +++++++++++++++++++ .../app/enums/ResultRecordStatusEnum.java | 39 ++++++++++++++ .../lz/modules/app/resp/OwnResultResp.java | 18 +++++++ .../sys/dao/app/ResultRecordMapper.java | 4 +- .../sys/service/app/ResultRecordService.java | 6 ++- .../app/impl/ResultRecordServiceImpl.java | 7 +++ .../mapper/app/ResultRecordMapper.xml | 4 ++ 8 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/controller/ReportResultController.java create mode 100644 src/main/java/com/lz/modules/app/enums/ResultRecordStatusEnum.java create mode 100644 src/main/java/com/lz/modules/app/resp/OwnResultResp.java diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 0eae9bdf..98c33d21 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -69,6 +69,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); + filterMap.put("/report/**","anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); diff --git a/src/main/java/com/lz/modules/app/controller/ReportResultController.java b/src/main/java/com/lz/modules/app/controller/ReportResultController.java new file mode 100644 index 00000000..abfefda4 --- /dev/null +++ b/src/main/java/com/lz/modules/app/controller/ReportResultController.java @@ -0,0 +1,51 @@ +package com.lz.modules.app.controller; + +import com.lz.common.utils.R; +import com.lz.modules.app.enums.ResultRecordStatusEnum; +import com.lz.modules.app.resp.OwnResultResp; +import com.lz.modules.app.service.DepartmentsService; +import com.lz.modules.app.service.DepartmentsStaffRelateService; +import com.lz.modules.sys.controller.AbstractController; +import com.lz.modules.sys.entity.app.ResultRecord; +import com.lz.modules.sys.service.app.ResultRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/9/11 10:22 + */ +@RestController +@RequestMapping("/report") +public class ReportResultController extends AbstractController{ + @Autowired + private ResultRecordService resultRecordService; + @Autowired + private DepartmentsStaffRelateService departmentsStaffRelateService; + @Autowired + private DepartmentsService departmentsService; + + + @RequestMapping("/own/result") + public R ownResult(Long userId){ + if(userId == null){ + //如果id为空，查询自己信息 + userId = getUserId(); + } + List ownResultResp = resultRecordService.ownResult(userId, ResultRecordStatusEnum.AGREE.getStatus()); + return R.ok().put("data",ownResultResp); + } + + + + @RequestMapping("/team/result") + public R teamResult(){ + + return R.ok(); + } + +} diff --git a/src/main/java/com/lz/modules/app/enums/ResultRecordStatusEnum.java b/src/main/java/com/lz/modules/app/enums/ResultRecordStatusEnum.java new file mode 100644 index 00000000..df8e321a --- /dev/null +++ b/src/main/java/com/lz/modules/app/enums/ResultRecordStatusEnum.java @@ -0,0 +1,39 @@ +package com.lz.modules.app.enums; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/9/14 9:38 + */ +public enum ResultRecordStatusEnum { + CREATE(0,"新建"), + AUDIT(1,"提交审批中"), + REFUSE(2,"拒绝"), + WAIT_COMMIT(3,"侍提交"), + AGREE(4,"审批通过"), + REJECT(5,"驳回"); + + private int status; + private String desc; + + ResultRecordStatusEnum(int status, String desc) { + this.status = status; + this.desc = desc; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/src/main/java/com/lz/modules/app/resp/OwnResultResp.java b/src/main/java/com/lz/modules/app/resp/OwnResultResp.java new file mode 100644 index 00000000..75d99562 --- /dev/null +++ b/src/main/java/com/lz/modules/app/resp/OwnResultResp.java @@ -0,0 +1,18 @@ +package com.lz.modules.app.resp; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/9/14 10:07 + */ +@Data +public class OwnResultResp { + //月份 + private String monthTime; + //最后得分 + private BigDecimal lastScore; +} diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index 88662612..67ee0e97 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -10,8 +10,8 @@ package com.lz.modules.sys.dao.app; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lz.modules.app.req.ResultRecordReq; +import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.flow.model.ResultRecordDto; import com.lz.modules.sys.entity.app.ResultRecord; import org.apache.ibatis.annotations.Mapper; @@ -50,4 +50,6 @@ public interface ResultRecordMapper extends BaseMapper { void updateFlowStaffIdRoleToNull(@Param("id") Long id); List selectResultRecordByIds(@Param("recordIds") List recordIds); + + List ownResult(@Param("userId") Long userId, @Param("status") int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index 51ab1c0b..6620d2fd 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -6,13 +6,13 @@ import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.req.ResultRecordReq; +import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.app.utils.t.TwoTuple; import com.lz.modules.flow.entity.Flow; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; import java.util.List; -import java.util.Map; /** *

@@ -67,4 +67,8 @@ public interface ResultRecordService extends IService { void sendWorkMSG(StaffEntity mySelf, StaffEntity toSelf, WorkMsgTypeEnum workMsgTypeEnum , Long recordResultId, int count); + + List ownResult(Long userId, int status); + + } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 4e87f416..f575cd08 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -12,6 +12,7 @@ import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.req.ResultRecordReq; +import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.app.resp.ResultRecordResp; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; @@ -608,4 +609,10 @@ public class ResultRecordServiceImpl extends ServiceImpl ownResult(Long userId, int status) { + return resultRecordMapper.ownResult(userId,status); + } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 703555ba..9b5499cf 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -247,5 +247,9 @@ + +