Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加一日流程评估计划时创建一日流程评估 部分代码

Browse Source
This commit is contained in:
sk1551
2021-02-23 18:33:51 +08:00
parent acdd617cbd
commit 728dd00a97
6 changed files with 302 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
View File

@ -74,6 +74,7 @@ public class ByDayflowassessmentController extends BaseController {
@PostMapping
public AjaxResult add(@RequestBody ByDayflowassessment byDayflowassessment) {
byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
return toAjax(byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment));
}

97
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
View File

@ -3,7 +3,9 @@ package com.ruoyi.project.benyi.controller;
import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.benyi.domain.ByDayflowassessment;
import com.ruoyi.project.benyi.service.IByDayFlowDetailService;
import com.ruoyi.project.benyi.service.IByDayflowassessmentService;
import com.ruoyi.project.common.SchoolCommon;
import com.ruoyi.project.system.service.IByClassService;
import com.ruoyi.project.system.service.ISysDictDataService;
@ -38,6 +40,8 @@ public class ByDayflowassessmentplanController extends BaseController {
@Autowired
private IByDayflowassessmentplanService byDayflowassessmentplanService;
@Autowired
private IByDayflowassessmentService byDayflowassessmentService;
@Autowired
private IByClassService byClassService;
@Autowired
private ISysDictDataService sysDictDataService;
@ -95,7 +99,53 @@ public class ByDayflowassessmentplanController extends BaseController {
byDayflowassessmentplan.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
byDayflowassessmentplan.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
byDayflowassessmentplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-" + sysDictDataService.selectDictLabel(dict_type, dict_value) + "-" + byDayFlowDetailService.selectByDayFlowDetailById(connentId).getName() + "-" + "评估计划" );
return toAjax(byDayflowassessmentplanService.insertByDayflowassessmentplan(byDayflowassessmentplan));
if
( byClassService.selectByClassById(classId).getZbjs() == null &&
byClassService.selectByClassById(classId).getPbjs() == null &&
byClassService.selectByClassById(classId).getZljs() == null
)
{
return AjaxResult.error("当前班级下没有教师，无法创建评估计划");
}
int iCount = byDayflowassessmentplanService.insertByDayflowassessmentplan(byDayflowassessmentplan);
if (iCount > 0) {
// 判断班级下是否有老师
int sum = 0;
Long zbjsNew = byClassService.selectByClassById(classId).getZbjs();
Long pbjsNew = byClassService.selectByClassById(classId).getPbjs();
Long zljsNew = byClassService.selectByClassById(classId).getZljs();
ByDayflowassessment byDayflowassessment = null;
if (zbjsNew != null) {
System.out.println("这是主班教师111");
byDayflowassessment = new ByDayflowassessment();
byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
byDayflowassessment.setBzbh(zbjsNew);
byDayflowassessment.setPgdx(zbjsNew);
byDayflowassessment.setClassid(classId);
byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq());
byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent()));
if (pbjsNew != null) {
byDayflowassessment.setPbbh(pbjsNew);
}
if (zljsNew != null) {
byDayflowassessment.setZlbh(zljsNew);
}
byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
sum += 1;
}
if (pbjsNew != null) {
System.out.println("这是配班教师222");
sum += 1;
}
if (zljsNew != null) {
System.out.println("这是助理教师333");
sum += 1;
}
}
return toAjax(iCount);
}
/**
@ -128,3 +178,48 @@ public class ByDayflowassessmentplanController extends BaseController {
return toAjax(byDayflowassessmentplanService.deleteByDayflowassessmentplanByIds(ids));
}
}

15
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
View File

@ -58,6 +58,12 @@ public class ByDayflowassessmentplan extends BaseEntity {
@Excel(name = "评估内容")
private String connent;
/**
* 内容分数
*/
@Excel(name = "内容分数")
private float score;
/**
* 评估时间
*/
@ -145,6 +151,7 @@ public class ByDayflowassessmentplan extends BaseEntity {
.append("xnxq", getXnxq())
.append("classid", getClassid())
.append("connent", getConnent())
.append("score", getScore())
.append("starttime", getStarttime())
.append("createUserid", getCreateUserid())
.append("createTime", getCreateTime())
@ -158,4 +165,12 @@ public class ByDayflowassessmentplan extends BaseEntity {
public void setName(String name) {
this.name = name;
}
public float getScore() {
return score;
}
public void setScore(float score) {
this.score = score;
}
}

9
ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
View File

@ -12,13 +12,14 @@
<result property="xnxq" column="xnxq"/>
<result property="classid" column="classid"/>
<result property="connent" column="connent"/>
<result property="score" column="score"/>
<result property="starttime" column="starttime"/>
<result property="createUserid" column="create_userid"/>
<result property="createTime" column="create_time"/>
</resultMap>
<sql id="selectByDayflowassessmentplanVo">
select id, name, dept_id, month, xnxq, classid, connent, starttime, create_userid, create_time from by_dayflowassessmentplan
select id, name, dept_id, month, xnxq, classid, connent, score, starttime, create_userid, create_time from by_dayflowassessmentplan
</sql>
<select id="selectByDayflowassessmentplanList" parameterType="ByDayflowassessmentplan"
@ -31,6 +32,7 @@
<if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
<if test="classid != null and classid != ''">and classid = #{classid}</if>
<if test="connent != null and connent != ''">and connent = #{connent}</if>
<if test="score != null and score != ''">and score = #{score}</if>
<if test="starttime != null ">and starttime = #{starttime}</if>
<if test="createUserid != null ">and create_userid = #{createUserid}</if>
</where>
@ -45,23 +47,27 @@
keyProperty="id">
insert into by_dayflowassessmentplan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="name != null and name != ''">name,</if>
<if test="deptId != null ">dept_id,</if>
<if test="month != null ">month,</if>
<if test="xnxq != null and xnxq != ''">xnxq,</if>
<if test="classid != null and classid != ''">classid,</if>
<if test="connent != null and connent != ''">connent,</if>
<if test="score != null and score != ''">score,</if>
<if test="starttime != null ">starttime,</if>
<if test="createUserid != null ">create_userid,</if>
<if test="createTime != null ">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="deptId != null ">#{deptId},</if>
<if test="month != null ">#{month},</if>
<if test="xnxq != null and xnxq != ''">#{xnxq},</if>
<if test="classid != null and classid != ''">#{classid},</if>
<if test="connent != null and connent != ''">#{connent},</if>
<if test="score != null and score != ''">#{score},</if>
<if test="starttime != null ">#{starttime},</if>
<if test="createUserid != null ">#{createUserid},</if>
<if test="createTime != null ">#{createTime},</if>
@ -77,6 +83,7 @@
<if test="xnxq != null and xnxq != ''">xnxq = #{xnxq},</if>
<if test="classid != null and classid != ''">classid = #{classid},</if>
<if test="connent != null and connent != ''">connent = #{connent},</if>
<if test="score != null and score != ''">score = #{score},</if>
<if test="starttime != null ">starttime = #{starttime},</if>
<if test="createUserid != null ">create_userid = #{createUserid},</if>
<if test="createTime != null ">create_time = #{createTime},</if>