5-4 代码提交

2 years ago · bbad9d4785
11 changed files with 37 additions and 64 deletions
--- 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
@ -37,6 +37,6 @@ public class SysPlan extends BaseEntity {

    @ApiModelProperty("进度内容")
    private String planContentJd;
-    @ApiModelProperty("反馈意见")
+    @ApiModelProperty("进度反馈意见")
    private String planOpinionYj;
 }
--- 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
@ -37,8 +37,8 @@ public interface SysPlanFeign {
    ResultBean selectSysPlan();

    @ApiOperation(value = "查询自己的自主学习计划")
-    @RequestMapping("/selectSysPlan/{studentNo}")
-    ResultBean selectSysPlan(@PathVariable String studentNo);
+    @RequestMapping("/selectSysPlanXs/{studentNo}")
+    ResultBean selectSysPlanXs(@PathVariable String studentNo);

    @ApiOperation(value = "老师查询待反馈的计划")
    @RequestMapping("/selectSysPlanStudent/{teacherNo}")
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanSchedule.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanSchedule.java
@ -19,4 +19,6 @@ public class SysPlanSchedule extends BaseEntity {
    private String planContent;
    @ApiModelProperty("反馈意见")
    private String planOpinion;
+    @ApiModelProperty("状态值中文")
+    private String stateChinese;
 }
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java
@ -28,5 +28,5 @@ public interface SysPlanScheduleFeign {

    @ApiOperation(value = "删除自主学习计划进度")
    @RequestMapping("/deleteSysPlanSchedule/{sid}")
-    ResultBean deleteSysPlanSchedule(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+    ResultBean deleteSysPlanSchedule(@PathVariable String sid);
 }
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java
@ -22,7 +22,7 @@ public interface SysPlanMapper extends BaseMapper<SysPlan> {

    SysPlan selectSysPlanBySid(@Param("sid") String sid);

-    SysPlan selectSysPlanCommentBySid(@Param("sid") String sid);
+    List<SysPlan> selectSysPlanCommentBySid(@Param("sid") String sid);

    List<SysPlan> selectSysPlanStudent(@Param("teacherNo") String teacherNo);

--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
@ -2,9 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.demo.system.biz.sys_plan.SysPlanMapper">
    <select id="selectSysPlanList" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
-        select p.id,p.sid,p.studentNo,p.teacherNo,p.planContent,p.planOpinion,i.name,i.department,i.speciality,i.calss from sys_plan p
-        left join sys_info i
-        on p.studentNo = i.infoId or p.teacherNo = i.infoId
+        select * from sys_plan p
    </select>

    <select id="selectSysPlanOneStudent" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
@ -33,7 +31,7 @@
    </select>

    <select id="selectSysPlanStudent" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
-        select * from sys_plan where teacherNo = #{teacherNo} and state = 1
+        select * from sys_plan where teacherNo = #{teacherNo}
    </select>

    <select id="selectSysPlan" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
--- 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
@ -66,8 +66,8 @@ public class SysPlanRest implements SysPlanFeign {
    }

    @Override
-    public ResultBean selectSysPlan(String studentNo) {
-        return sysPlanService.selectSysPlan(studentNo);
+    public ResultBean selectSysPlanXs(String studentNo) {
+        return sysPlanService.selectSysPlanXs(studentNo);
    }

    @Override
--- 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
@ -35,6 +35,7 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
        }
        SysPlanSchedule sysPlanSchedule = new SysPlanSchedule();
        sysPlanSchedule.setPlanSid(sysPlan.getSid());
+        sysPlanSchedule.setPlanContent("0%");
        sysPlanScheduleService.saveSysPlanSchedule(sysPlanSchedule);
        return rb.success();
    }
@ -42,6 +43,12 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
    public ResultBean alterSysPlan(SysPlan sysPlan) {
        ResultBean rb = ResultBean.fireFail();
        sysPlan.setModifyTime(new Date());
+        if (sysPlan.getPlanOpinion() != null){
+            sysPlan.setState(2);
+            sysPlan.setStateChinese("已反馈");
+        }else {
+            return rb.setMsg("请填写反馈");
+        }
        int i = baseMapper.updateById(sysPlan);
        if (i == 0){
            return rb.setMsg("修改失败");
@ -52,15 +59,6 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
    public ResultBean selectSysPlan() {
        ResultBean rb = ResultBean.fireFail();
        List<SysPlan> 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);
    }

@ -69,23 +67,9 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
        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("没有该任务");
@ -93,15 +77,8 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {

    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);
+        List<SysPlan> sysPlans = sysPlanMapper.selectSysPlanCommentBySid(sid);
+        return rb.success().setData(sysPlans);
    }

    public ResultBean selectSysPlanStudent(String teacherNo) {
@ -110,38 +87,21 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
        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);
    }

-    public ResultBean selectSysPlan(String studentNo) {
+    public ResultBean selectSysPlanXs(String studentNo) {
        ResultBean rb = ResultBean.fireFail();
        List<SysPlan> sysPlans = sysPlanMapper.selectSysPlan(studentNo);
        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().setMsg("你还没有制定学习计划");
        }
        return rb.success().setData(sysPlans);
    }

    public ResultBean upSysPlan(SysPlan sysPlan) {
        ResultBean rb = ResultBean.fireFail();
+        sysPlan.setStateChinese("待反馈");
        if (sysPlan.getId() == null){
            if (sysPlan.getTeacherNo() == null){
                return rb.setMsg("提交失败，请选择提交的教师");
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml
@ -4,6 +4,12 @@
    <update id="updateSysPlanScheduleBySid" parameterType="com.yxt.demo.system.api.sys_plan_schedule.SysPlanSchedule">
        update sys_plan_schedule
        <set>
+            <if test="state != null">
+                state = #{state},
+            </if>
+            <if test="stateChinese != null">
+                state = #{stateChinese},
+            </if>
            <if test="planContent != null">
                planContent = #{planContent},
            </if>
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java
@ -35,10 +35,15 @@ public class SysPlanScheduleService extends MybatisBaseService<SysPlanScheduleMa

    public ResultBean updateSysPlanSchedule(SysPlanSchedule sysPlanSchedule) {
        ResultBean rb = ResultBean.fireFail();
-        if (sysPlanSchedule.getSid() == null){
+        if (sysPlanSchedule.getId() == null){
+            if (sysPlanSchedule.getPlanOpinion() != null){
+                return rb.setMsg("您不能添加反馈意见");
+            }
            baseMapper.insert(sysPlanSchedule);
            return rb.success().setMsg("添加成功");
        }
+        sysPlanSchedule.setState(1);
+        sysPlanSchedule.setStateChinese("已反馈");
        sysPlanScheduleMapper.updateSysPlanScheduleBySid(sysPlanSchedule);
        return rb.success();
    }
--- a/doc/database/demo_system.sql
+++ b/doc/database/demo_system.sql
@ -246,6 +246,7 @@ CREATE TABLE `sys_plan`
    `studentNo`   varchar(200)         DEFAULT NULL COMMENT '学号',
    `planContent` text                 DEFAULT NULL COMMENT '学习计划内容',
    `planOpinion` text                 DEFAULT NULL COMMENT '反馈意见',
+    `stateChinese` text                DEFAULT NULL COMMENT '状态值中文',
    PRIMARY KEY (`id`),
    KEY `id` (`id`)
 ) ENGINE = INNODB
@ -269,6 +270,7 @@ CREATE TABLE `sys_plan_schedule`
    `planSid`     varchar(64)          DEFAULT NULL COMMENT '计划sid',
    `planContent` text                 DEFAULT NULL COMMENT '进度内容',
    `planOpinion` text                 DEFAULT NULL COMMENT '反馈意见',
+    `stateChinese` text                DEFAULT NULL COMMENT '状态值中文',
    PRIMARY KEY (`id`),
    KEY `id` (`id`)
 ) ENGINE = INNODB