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

一日流程评估详情和计划修改

Browse Source
This commit is contained in:
zhanglipeng
2021-04-09 15:00:10 +08:00
parent 7682ce5795
commit fd6a5bfa6c
11 changed files with 393 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
View File

@ -48,6 +48,13 @@ public class ByDayFlowStandardController extends BaseController
return getDataTable(list);
}
@GetMapping("/listassessment")
public TableDataInfo listassessment(ByDayFlowStandard byDayFlowStandard)
{
List<ByDayFlowStandard> list = byDayFlowStandardService.selectByDayFlowStandardListAssessment(byDayFlowStandard);
return getDataTable(list);
}
/**
* 导出一日流程标准列表
*/

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

@ -85,6 +85,8 @@ public class ByDayflowassessmentController extends BaseController {
byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
byDayflowassessment.setXnxq(schoolCommon.getCurrentXnXq());
//获取总得分
byDayflowassessment.setZzdf(GetDf(byDayflowassessment.getList()));
int iRows = byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
List<ByDayFlowStandard> list = byDayflowassessment.getList();
@ -110,6 +112,22 @@ public class ByDayflowassessmentController extends BaseController {
return toAjax(iRows);
}
public Double GetDf(List<ByDayFlowStandard> list) {
Double df = (double) 0;
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
String mrz = list.get(i).getMrz();
if (mrz != "0" && !schoolCommon.isStringEmpty(mrz)) {
Double dMrz = Double.valueOf(mrz);
if (dMrz != 0) {
df = df + dMrz;
}
}
}
}
return df;
}
/**
* 修改幼儿园一日流程评估
*/

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

@ -100,76 +100,8 @@ 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() + "-" + "评估计划");
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) {
// 判断班级下是否有老师
Long zbjsNew = byClassService.selectByClassById(classId).getZbjs();
Long pbjsNew = byClassService.selectByClassById(classId).getPbjs();
Long zljsNew = byClassService.selectByClassById(classId).getZljs();
ByDayflowassessment byDayflowassessment = null;
if (zbjsNew != null) {
byDayflowassessment = new ByDayflowassessment();
byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
byDayflowassessment.setBzbh(zbjsNew);
byDayflowassessment.setPgdx(zbjsNew);
byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore());
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);
}
if (pbjsNew != null) {
byDayflowassessment = new ByDayflowassessment();
byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
byDayflowassessment.setPbbh(pbjsNew);
byDayflowassessment.setPgdx(pbjsNew);
byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore());
byDayflowassessment.setClassid(classId);
byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq());
byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent()));
if (zbjsNew != null) {
byDayflowassessment.setBzbh(zbjsNew);
}
if (zljsNew != null) {
byDayflowassessment.setZlbh(zljsNew);
}
byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
}
if (zljsNew != null) {
byDayflowassessment = new ByDayflowassessment();
byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
byDayflowassessment.setZlbh(zljsNew);
byDayflowassessment.setPgdx(zljsNew);
byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore());
byDayflowassessment.setClassid(classId);
byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq());
byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent()));
if (pbjsNew != null) {
byDayflowassessment.setPbbh(pbjsNew);
}
if (zbjsNew != null) {
byDayflowassessment.setBzbh(zbjsNew);
}
byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
}
}
return toAjax(iCount);
}

8
ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java
View File

@ -27,6 +27,14 @@ public interface ByDayFlowStandardMapper
*/
public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard);
/**
* 查询一日流程标准列表
*
* @param byDayFlowStandard 一日流程标准
* @return 一日流程标准集合
*/
public List<ByDayFlowStandard> selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard);
/**
* 新增一日流程标准
*

9
ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java
View File

@ -27,6 +27,15 @@ public interface IByDayFlowStandardService
*/
public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard);
/**
* 查询一日流程标准列表
*
* @param byDayFlowStandard 一日流程标准
* @return 一日流程标准集合
*/
public List<ByDayFlowStandard> selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard);
/**
* 新增一日流程标准
*

47
ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.project.benyi.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.benyi.mapper.ByDayFlowStandardMapper;
@ -9,85 +10,89 @@ import com.ruoyi.project.benyi.service.IByDayFlowStandardService;
/**
* 一日流程标准Service业务层处理
*
*
* @author tsbz
* @date 2020-05-18
*/
@Service
public class ByDayFlowStandardServiceImpl implements IByDayFlowStandardService
{
public class ByDayFlowStandardServiceImpl implements IByDayFlowStandardService {
@Autowired
private ByDayFlowStandardMapper byDayFlowStandardMapper;
/**
* 查询一日流程标准
*
*
* @param sid 一日流程标准ID
* @return 一日流程标准
*/
@Override
public ByDayFlowStandard selectByDayFlowStandardById(Long sid)
{
public ByDayFlowStandard selectByDayFlowStandardById(Long sid) {
return byDayFlowStandardMapper.selectByDayFlowStandardById(sid);
}
/**
* 查询一日流程标准列表
*
*
* @param byDayFlowStandard 一日流程标准
* @return 一日流程标准
*/
@Override
public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard)
{
public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard) {
return byDayFlowStandardMapper.selectByDayFlowStandardList(byDayFlowStandard);
}
/**
* 查询一日流程标准列表
*
* @param byDayFlowStandard 一日流程标准
* @return 一日流程标准集合
*/
@Override
public List<ByDayFlowStandard> selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard) {
return byDayFlowStandardMapper.selectByDayFlowStandardListAssessment(byDayFlowStandard);
}
/**
* 新增一日流程标准
*
*
* @param byDayFlowStandard 一日流程标准
* @return 结果
*/
@Override
public int insertByDayFlowStandard(ByDayFlowStandard byDayFlowStandard)
{
public int insertByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) {
return byDayFlowStandardMapper.insertByDayFlowStandard(byDayFlowStandard);
}
/**
* 修改一日流程标准
*
*
* @param byDayFlowStandard 一日流程标准
* @return 结果
*/
@Override
public int updateByDayFlowStandard(ByDayFlowStandard byDayFlowStandard)
{
public int updateByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) {
return byDayFlowStandardMapper.updateByDayFlowStandard(byDayFlowStandard);
}
/**
* 批量删除一日流程标准
*
*
* @param sids 需要删除的一日流程标准ID
* @return 结果
*/
@Override
public int deleteByDayFlowStandardByIds(Long[] sids)
{
public int deleteByDayFlowStandardByIds(Long[] sids) {
return byDayFlowStandardMapper.deleteByDayFlowStandardByIds(sids);
}
/**
* 删除一日流程标准信息
*
*
* @param sid 一日流程标准ID
* @return 结果
*/
@Override
public int deleteByDayFlowStandardById(Long sid)
{
public int deleteByDayFlowStandardById(Long sid) {
return byDayFlowStandardMapper.deleteByDayFlowStandardById(sid);
}
}

6
ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
View File

@ -15,6 +15,7 @@
<result property="createtime" column="createtime"/>
<result property="updateuser" column="updateuser"/>
<result property="updatetime" column="updatetime"/>
<result property="mrz" column="mrz"/>
</resultMap>
<sql id="selectByDayFlowStandardVo">
@ -37,6 +38,11 @@
</where>
</select>
<select id="selectByDayFlowStandardListAssessment" parameterType="ByDayFlowStandard" resultMap="ByDayFlowStandardResult">
select a.id, a.task_code, a.standard_title, a.score, a.standard_sort, a.createuser, a.createtime, a.updateuser, a.updatetime,b.value as mrz from by_day_flow_standard a
left join (select * from by_dayflowassessmentitem where pid=#{id}) b on a.id=b.item
</select>
<select id="selectByDayFlowStandardById" parameterType="Long" resultMap="ByDayFlowStandardResult">
<include refid="selectByDayFlowStandardVo"/>
where id = #{id}