From 552733fe01c17597d9154b63c49956641d8afead Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Tue, 2 May 2023 18:29:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/demo/system/api/sys_plan/SysPlan.java | 3 + .../system/api/sys_plan/SysPlanFeign.java | 4 ++ .../demo/system/biz/sys_plan/SysPlanRest.java | 5 ++ .../system/biz/sys_plan/SysPlanService.java | 70 +++++++++++++++++-- 4 files changed, 75 insertions(+), 7 deletions(-) diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java index 0a9b945..31797c2 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java @@ -22,6 +22,9 @@ public class SysPlan extends BaseEntity { private String planContent; @ApiModelProperty("反馈意见") private String planOpinion; + @ApiModelProperty("状态中文") + private String stateChinese; + @ApiModelProperty("姓名") private String name; diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java index 632008c..2f7c656 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java @@ -28,6 +28,10 @@ public interface SysPlanFeign { @RequestMapping("/alterSysPlan") ResultBean alterSysPlan(@RequestBody SysPlan sysPlan); + @ApiOperation(value = "提交自主学习计划") + @RequestMapping("/upSysPlan") + ResultBean upSysPlan(@RequestBody SysPlan sysPlan); + @ApiOperation(value = "查询自主学习计划") @RequestMapping("/selectSysPlan") ResultBean selectSysPlan(); diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java index 2e0e024..ce2dfb2 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java @@ -69,4 +69,9 @@ public class SysPlanRest implements SysPlanFeign { public ResultBean selectSysPlan(String studentNo) { return sysPlanService.selectSysPlan(studentNo); } + + @Override + public ResultBean upSysPlan(SysPlan sysPlan) { + return sysPlanService.upSysPlan(sysPlan); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java index b2fedf7..12013a2 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java @@ -8,6 +8,7 @@ import com.yxt.demo.system.utils.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -40,13 +41,7 @@ public class SysPlanService extends MybatisBaseService { public ResultBean alterSysPlan(SysPlan sysPlan) { ResultBean rb = ResultBean.fireFail(); - if (sysPlan.getTeacherNo() != null){ - if (sysPlan.getPlanOpinion() != null){ - sysPlan.setState(2); - }else { - sysPlan.setState(1); - } - } + sysPlan.setModifyTime(new Date()); int i = baseMapper.updateById(sysPlan); if (i == 0){ return rb.setMsg("修改失败"); @@ -57,6 +52,15 @@ public class SysPlanService extends MybatisBaseService { public ResultBean selectSysPlan() { ResultBean rb = ResultBean.fireFail(); List sysPlans = sysPlanMapper.selectSysPlanList(); + for (SysPlan sysPlan : sysPlans) { + if (sysPlan.getState() == 0){ + sysPlan.setStateChinese("待提交"); + }else if (sysPlan.getState() == 1){ + sysPlan.setStateChinese("待反馈"); + }else if (sysPlan.getState() == 2){ + sysPlan.setStateChinese("已反馈"); + } + } return rb.success().setData(sysPlans); } @@ -65,9 +69,23 @@ public class SysPlanService extends MybatisBaseService { SysPlan sysPlan1 = sysPlanMapper.selectSysPlanBySid(sid); if (sysPlan1.getStudentNo() != null){ SysPlan sysPlan = sysPlanMapper.selectSysPlanOneStudent(sid); + if (sysPlan.getState() == 0){ + sysPlan.setStateChinese("待提交"); + }else if (sysPlan.getState() == 1){ + sysPlan.setStateChinese("待反馈"); + }else if (sysPlan.getState() == 2){ + sysPlan.setStateChinese("已反馈"); + } return rb.success().setData(sysPlan); }else if (sysPlan1.getTeacherNo() != null){ SysPlan sysPlan = sysPlanMapper.selectSysPlanOneTeacher(sid); + if (sysPlan.getState() == 0){ + sysPlan.setStateChinese("待提交"); + }else if (sysPlan.getState() == 1){ + sysPlan.setStateChinese("待反馈"); + }else if (sysPlan.getState() == 2){ + sysPlan.setStateChinese("已反馈"); + } return rb.success().setData(sysPlan); } return rb.setMsg("没有该任务"); @@ -76,6 +94,13 @@ public class SysPlanService extends MybatisBaseService { public ResultBean selectSysPlanCommentBySid(String sid) { ResultBean rb = ResultBean.fireFail(); SysPlan sysPlan = sysPlanMapper.selectSysPlanBySid(sid); + if (sysPlan.getState() == 0){ + sysPlan.setStateChinese("待提交"); + }else if (sysPlan.getState() == 1){ + sysPlan.setStateChinese("待反馈"); + }else if (sysPlan.getState() == 2){ + sysPlan.setStateChinese("已反馈"); + } return rb.success().setData(sysPlan); } @@ -85,6 +110,15 @@ public class SysPlanService extends MybatisBaseService { if (sysPlans == null){ return rb.setMsg("该老师下没有待反馈的计划"); } + for (SysPlan sysPlan : sysPlans) { + if (sysPlan.getState() == 0){ + sysPlan.setStateChinese("待提交"); + }else if (sysPlan.getState() == 1){ + sysPlan.setStateChinese("待反馈"); + }else if (sysPlan.getState() == 2){ + sysPlan.setStateChinese("已反馈"); + } + } return rb.success().setData(sysPlans); } @@ -94,6 +128,28 @@ public class SysPlanService extends MybatisBaseService { if (sysPlans.size() == 0){ return rb.setMsg("你还没有制定学习计划"); } + for (SysPlan sysPlan : sysPlans) { + if (sysPlan.getState() == 0){ + sysPlan.setStateChinese("待提交"); + }else if (sysPlan.getState() == 1){ + sysPlan.setStateChinese("待反馈"); + }else if (sysPlan.getState() == 2){ + sysPlan.setStateChinese("已反馈"); + } + } return rb.success().setData(sysPlans); } + + public ResultBean upSysPlan(SysPlan sysPlan) { + ResultBean rb = ResultBean.fireFail(); + if (sysPlan.getTeacherNo() == null){ + return rb.setMsg("提交失败，请选择提交的教师"); + } + sysPlan.setState(1); + int i = baseMapper.updateById(sysPlan); + if (i == 0){ + return rb.setMsg("提交失败"); + } + return rb.success(); + } }