Skip to content

D
dd_school
Commit a4efb984 by xuwenhao
Options

11.2修改测试问题

parent 0ef44e50
Showing with 920 additions and 110 deletions
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
...@@ -126,6 +126,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -126,6 +126,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers( "/dd/school/**").permitAll() .antMatchers( "/dd/school/**").permitAll()
//打印下载接口放行 //打印下载接口放行
.antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll() .antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll()
//打印设备条码信息
.antMatchers("/equipmentLedger/getEquipmentledger/**").permitAll()
.antMatchers("/school/studentStatus/exportStatus/**","/school/student/queryAllInfo/**").permitAll()
//网页注册登录接口放行 //网页注册登录接口放行
.antMatchers( "/web/artStudent/register","/web/artStudent/login").permitAll() .antMatchers( "/web/artStudent/register","/web/artStudent/login").permitAll()
// 静态资源，可匿名访问 // 静态资源，可匿名访问
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/SchoolEquipment/EquipmentLedgerController.java
package yangtz.cs.liu.campus.controller.SchoolEquipment; package yangtz.cs.liu.campus.controller.SchoolEquipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
...@@ -7,17 +8,21 @@ import com.ruoyi.common.core.domain.entity.SysUser; ...@@ -7,17 +8,21 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger; import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService; import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
import yangtz.cs.liu.campus.vo.curricula.CurriculaStudentVo; import yangtz.cs.liu.campus.vo.curricula.CurriculaStudentVo;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerDcVo;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo; import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
import yangtz.cs.liu.campus.vo.student.SchoolStudentScoreVo; import yangtz.cs.liu.campus.vo.student.SchoolStudentScoreVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 设备基础信息 * 设备基础信息
...@@ -58,8 +63,17 @@ public class EquipmentLedgerController extends BaseController { ...@@ -58,8 +63,17 @@ public class EquipmentLedgerController extends BaseController {
public void export(HttpServletResponse response, SchoolEquipmentLedgerVo schoolEquipmentLedgerVo) public void export(HttpServletResponse response, SchoolEquipmentLedgerVo schoolEquipmentLedgerVo)
{ {
List<SchoolEquipmentLedger> list = equipmentLedgerService.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo); List<SchoolEquipmentLedger> list = equipmentLedgerService.selectSchoolEquipmentLedgerList(schoolEquipmentLedgerVo);
ExcelUtil<SchoolEquipmentLedger> util = new ExcelUtil<SchoolEquipmentLedger>(SchoolEquipmentLedger.class); List<SchoolEquipmentLedgerDcVo> list1 = new ArrayList<>();
util.exportExcel(response, list, "设备台账数据"); int i = 1;
for (SchoolEquipmentLedger schoolEquipmentLedger : list) {
SchoolEquipmentLedgerDcVo schoolEquipmentLedgerDcVo = new SchoolEquipmentLedgerDcVo();
BeanUtils.copyProperties(schoolEquipmentLedger,schoolEquipmentLedgerDcVo);
schoolEquipmentLedgerDcVo.setSerialNumber(i);
list1.add(schoolEquipmentLedgerDcVo);
i++;
}
ExcelUtil<SchoolEquipmentLedgerDcVo> util = new ExcelUtil<SchoolEquipmentLedgerDcVo>(SchoolEquipmentLedgerDcVo.class);
util.exportExcel(response, list1, "设备台账数据");
} }
/** /**
...@@ -138,4 +152,13 @@ public class EquipmentLedgerController extends BaseController { ...@@ -138,4 +152,13 @@ public class EquipmentLedgerController extends BaseController {
public TableDataInfo getUser(SysUser sysUser){ public TableDataInfo getUser(SysUser sysUser){
return getDataTable(equipmentLedgerService.getUser(sysUser)); return getDataTable(equipmentLedgerService.getUser(sysUser));
} }
/**
* 打印设备条码信息
*/
@GetMapping("/getEquipmentledger/{ids}")
public AjaxResult getEquipmentledger(@PathVariable Long[] ids){
List<Map<String,Object>> mapList = equipmentLedgerService.getEquipmentledger(ids);
return AjaxResult.success(mapList);
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolDcwj/SchoolDcwjController.java
...@@ -41,6 +41,7 @@ import yangtz.cs.liu.campus.domain.schoolDcwj.*; ...@@ -41,6 +41,7 @@ import yangtz.cs.liu.campus.domain.schoolDcwj.*;
import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDuty; import yangtz.cs.liu.campus.domain.schoolDuty.SchoolDuty;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade; import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.student.SchoolStudent; import yangtz.cs.liu.campus.domain.student.SchoolStudent;
import yangtz.cs.liu.campus.mapper.schoolDcwj.SchoolDcwjPushMapper;
import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService; import yangtz.cs.liu.campus.service.schoolClass.ISchoolClassService;
import yangtz.cs.liu.campus.service.schoolDcwj.*; import yangtz.cs.liu.campus.service.schoolDcwj.*;
import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService; import yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService;
...@@ -88,6 +89,7 @@ public class SchoolDcwjController extends BaseController { ...@@ -88,6 +89,7 @@ public class SchoolDcwjController extends BaseController {
@Autowired @Autowired
private ISchoolDcwjPushService pushService; private ISchoolDcwjPushService pushService;
@Value("${server.port}") @Value("${server.port}")
private String p; private String p;
...@@ -513,9 +515,122 @@ public class SchoolDcwjController extends BaseController { ...@@ -513,9 +515,122 @@ public class SchoolDcwjController extends BaseController {
ajax.put("titles", titlesVo); ajax.put("titles", titlesVo);
//获取内容 //获取内容
List<SchoolDcwjAnVo> list = schoolDcwjRyService.getSenateAnData(dcwjId, vo); // List<SchoolDcwjAnVo> list = schoolDcwjRyService.getSenateAnData(dcwjId, vo);
//判断是推送给教师还是家长
LambdaQueryWrapper<SchoolDcwjPush> pushLqw = new LambdaQueryWrapper<>();
pushLqw.eq(SchoolDcwjPush::getDcwjId,dcwjId);
List<SchoolDcwjPush> pushes = pushService.list(pushLqw);
if(DcwjType.PUSHT.equals(pushes.get(0).getPubType())){
//教师
//获取固定列的值,,获取到的list的id为ry表的id
startPage();
List<SchoolDcwjAnVo> list = schoolDcwjRyService.getTeaAnData(dcwjId, vo);
//获取问卷调查题目
LambdaQueryWrapper<SchoolDcwjNr> nrlqw = new LambdaQueryWrapper<>();
nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime);
List<SchoolDcwjNr> nrs = schoolDcwjNrService.list(nrlqw);
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId)
;
//a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = schoolDcwjAnService.list(lqw);
//教师调查问卷回答的内容
for (SchoolDcwjAnVo anVo : list) {
List<SchoolDcwjAn> ans = new ArrayList<>();
//设置空对象，是为了，通俗的说就是站位，如果不占位的话，就目前来说，如果用户第一题没写，第二题写了，那么第2题的答案会显示在第1题的位置
SchoolDcwjAn entity = new SchoolDcwjAn();
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){
// LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
// lqw
// .eq(SchoolDcwjAn::getDcwjId, dcwjId)
// .eq(SchoolDcwjAn::getRyId, anVo.getId())
// .eq(SchoolDcwjAn::getNrId, nr.getId())
// ;
// //a里要么有1个值，要么没有值
// List<SchoolDcwjAn> a = anMapper.selectList(lqw);
for (SchoolDcwjAn schoolDcwjAn : a) {
if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
ans.add(schoolDcwjAn);
}else {
ans.add(entity);
}
}
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
}
anVo.setList(ans);
}
List<ViewDataVo> voList = schoolDcwjNrService.turnData(list);
ajax.put("data", voList);
ajax.put("total",getDataTable(list).getTotal());
return ajax;
}
//推送类型为学生家长
//获取固定列的值,,获取到的list的id为ry表的id
startPage();
List<SchoolDcwjAnVo> list = schoolDcwjRyService.getAnData1(dcwjId, vo);
//获取问卷调查题目
LambdaQueryWrapper<SchoolDcwjNr> nrlqw = new LambdaQueryWrapper<>();
nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime);
List<SchoolDcwjNr> nrs = schoolDcwjNrService.list(nrlqw);
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId)
;
//a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = schoolDcwjAnService.list(lqw);
//学生家长调查问卷回答的内容
for (SchoolDcwjAnVo anVo : list) {
List<SchoolDcwjAn> ans = new ArrayList<>();
//设置空对象，是为了，通俗的说就是站位，如果不占位的话，就目前来说，如果用户第一题没写，第二题写了，那么第2题的答案会显示在第1题的位置
SchoolDcwjAn entity = new SchoolDcwjAn();
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){
// LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
// lqw
// .eq(SchoolDcwjAn::getDcwjId, dcwjId)
// .eq(SchoolDcwjAn::getRyId, anVo.getId())
// .eq(SchoolDcwjAn::getNrId, nr.getId())
// ;
// //a里要么有1个值，要么没有值
// List<SchoolDcwjAn> a = anMapper.selectList(lqw);
for (SchoolDcwjAn schoolDcwjAn : a) {
if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
ans.add(schoolDcwjAn);
}else {
ans.add(entity);
}
}
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
}
anVo.setList(ans);
}
List<ViewDataVo> voList = schoolDcwjNrService.turnData(list); List<ViewDataVo> voList = schoolDcwjNrService.turnData(list);
ajax.put("data", voList); ajax.put("data", voList);
ajax.put("total",getDataTable(list).getTotal());
return ajax; return ajax;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/studentStatus/StudentStatusController.java
...@@ -122,7 +122,9 @@ public class StudentStatusController { ...@@ -122,7 +122,9 @@ public class StudentStatusController {
map.put("avatar", image); map.put("avatar", image);
} }
map.put("idCard",baseInfo.getIdCard()); map.put("idCard",baseInfo.getIdCard());
if (StringUtils.isNotNull(baseInfo.getBirthday())){
map.put("birthday",new SimpleDateFormat("yyyy-MM-dd").format(baseInfo.getBirthday())); map.put("birthday",new SimpleDateFormat("yyyy-MM-dd").format(baseInfo.getBirthday()));
}
map.put("nation",baseInfo.getNation()); map.put("nation",baseInfo.getNation());
map.put("stuTelephone",baseInfo.getStuTelephone()); map.put("stuTelephone",baseInfo.getStuTelephone());
map.put("postalCode",baseInfo.getPostalCode()); map.put("postalCode",baseInfo.getPostalCode());
...@@ -285,7 +287,9 @@ public class StudentStatusController { ...@@ -285,7 +287,9 @@ public class StudentStatusController {
}else{ }else{
map.put("sex","女"); map.put("sex","女");
} }
if (StringUtils.isNotNull(baseInfo.getBirthday())){
map.put("birthday",new SimpleDateFormat("yyyy-MM-dd").format(baseInfo.getBirthday())); map.put("birthday",new SimpleDateFormat("yyyy-MM-dd").format(baseInfo.getBirthday()));
}
map.put("idCard",baseInfo.getIdCard()); map.put("idCard",baseInfo.getIdCard());
// 图片 // 图片
//路径去掉/profile //路径去掉/profile
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherController.java
...@@ -238,49 +238,65 @@ public class SchoolTeacherController extends BaseController { ...@@ -238,49 +238,65 @@ public class SchoolTeacherController extends BaseController {
//查询设备号 //查询设备号
if(StringUtils.isNotNull(schoolTeacher.getDeviceNum())){ if(StringUtils.isNotNull(schoolTeacher.getDeviceNum())){
LambdaQueryWrapper<SchoolTeacher> lqw1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolTeacher> lqw1 = new LambdaQueryWrapper<>();
lqw1.eq(SchoolTeacher::getDeviceNum,schoolTeacher.getDeviceNum()); lqw1.notIn(SchoolTeacher::getId,schoolTeacher.getId())
.eq(SchoolTeacher::getDeviceNum,schoolTeacher.getDeviceNum());
SchoolTeacher teacher = schoolTeacherService.getOne(lqw1); SchoolTeacher teacher = schoolTeacherService.getOne(lqw1);
if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) { if (StringUtils.isNotNull(teacher)){
}else if(schoolTeacher.getDeviceNum().equals(teacher.getDeviceNum())){
throw new ServiceException("设备号已存在"); throw new ServiceException("设备号已存在");
} }
// if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) {
//
// }else if(schoolTeacher.getDeviceNum().equals(teacher.getDeviceNum())){
// throw new ServiceException("设备号已存在");
// }
} }
//查询身份证号 //查询身份证号
if(StringUtils.isNotNull(schoolTeacher.getIdCard())){ if(StringUtils.isNotNull(schoolTeacher.getIdCard())){
LambdaQueryWrapper<SchoolTeacher> lqw2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolTeacher> lqw2 = new LambdaQueryWrapper<>();
lqw2.eq(SchoolTeacher::getIdCard,schoolTeacher.getIdCard()); lqw2.notIn(SchoolTeacher::getId,schoolTeacher.getId())
.eq(SchoolTeacher::getIdCard,schoolTeacher.getIdCard());
SchoolTeacher teacher = schoolTeacherService.getOne(lqw2); SchoolTeacher teacher = schoolTeacherService.getOne(lqw2);
if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) { if (StringUtils.isNotNull(teacher)){
}else if(schoolTeacher.getIdCard().equals(teacher.getIdCard())){
throw new ServiceException("身份证号已存在"); throw new ServiceException("身份证号已存在");
} }
// if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) {
//
// }else if(schoolTeacher.getIdCard().equals(teacher.getIdCard())){
// throw new ServiceException("身份证号已存在");
// }
} }
//查询编号 //查询编号
if(StringUtils.isNotNull(schoolTeacher.getTeacherCode())){ if(StringUtils.isNotNull(schoolTeacher.getTeacherCode())){
LambdaQueryWrapper<SchoolTeacher> lqw3 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolTeacher> lqw3 = new LambdaQueryWrapper<>();
lqw3.eq(SchoolTeacher::getTeacherCode,schoolTeacher.getTeacherCode()); lqw3.notIn(SchoolTeacher::getId,schoolTeacher.getId())
.eq(SchoolTeacher::getTeacherCode,schoolTeacher.getTeacherCode());
SchoolTeacher teacher = schoolTeacherService.getOne(lqw3); SchoolTeacher teacher = schoolTeacherService.getOne(lqw3);
if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) { if (StringUtils.isNotNull(teacher)){
}else if(schoolTeacher.getTeacherCode().equals(teacher.getTeacherCode())){
throw new ServiceException("编号已存在"); throw new ServiceException("编号已存在");
} }
// if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) {
//
// }else if(schoolTeacher.getTeacherCode().equals(teacher.getTeacherCode())){
// throw new ServiceException("编号已存在");
// }
} }
//查询电话号码 //查询电话号码
if(StringUtils.isNotNull(schoolTeacher.getTeacherCode())){ if(StringUtils.isNotNull(schoolTeacher.getTeacherCode())){
LambdaQueryWrapper<SchoolTeacher> lqw4 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolTeacher> lqw4 = new LambdaQueryWrapper<>();
lqw4.eq(SchoolTeacher::getTeacherTel,schoolTeacher.getTeacherTel()); lqw4.notIn(SchoolTeacher::getId,schoolTeacher.getId())
.eq(SchoolTeacher::getTeacherTel,schoolTeacher.getTeacherTel());
SchoolTeacher teacher = schoolTeacherService.getOne(lqw4); SchoolTeacher teacher = schoolTeacherService.getOne(lqw4);
if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) { if (StringUtils.isNotNull(teacher)){
}else if(schoolTeacher.getTeacherTel().equals(teacher.getTeacherTel())){
throw new ServiceException("电话号码已存在"); throw new ServiceException("电话号码已存在");
} }
// if (StringUtils.isNotNull(schoolTeacher.getId()) && schoolTeacher.getId().equals(teacher.getId())) {
//
// }else if(schoolTeacher.getTeacherTel().equals(teacher.getTeacherTel())){
// throw new ServiceException("电话号码已存在");
// }
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolCirculation.java
package yangtz.cs.liu.campus.domain.schoolEquipment; package yangtz.cs.liu.campus.domain.schoolEquipment;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.core.domain.OurBaseEntity; import com.core.domain.OurBaseEntity;
...@@ -52,13 +54,12 @@ public class SchoolCirculation extends OurBaseEntity ...@@ -52,13 +54,12 @@ public class SchoolCirculation extends OurBaseEntity
/** 接收人 */ /** 接收人 */
private String receivedBy; private String receivedBy;
/** 预计使用时间 */ /** 预计使用期限 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date yjuseTime; private Date yjuseTime;
/** 实际使用时间 */ /** 实际使用时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Long sjuseTime;
private Date sjuseTime;
/** 备注 */ /** 备注 */
private String remark; private String remark;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolgrade/SchoolGradeMentor.java
...@@ -33,7 +33,6 @@ public class SchoolGradeMentor extends OurBaseEntity { ...@@ -33,7 +33,6 @@ public class SchoolGradeMentor extends OurBaseEntity {
private String type; private String type;
/** 职务 */ /** 职务 */
@NotBlank(message = "职务不能为空")
private String teacherPost; private String teacherPost;
/** 学科组(1物理学科组，2化学学科组，3生物学科组) */ /** 学科组(1物理学科组，2化学学科组，3生物学科组) */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacher/SchoolTeacherWages.java
...@@ -40,9 +40,14 @@ public class SchoolTeacherWages extends OurBaseEntity { ...@@ -40,9 +40,14 @@ public class SchoolTeacherWages extends OurBaseEntity {
private BigDecimal basePay; private BigDecimal basePay;
/** /**
* 教师电话
*/
@Excel(name = "教师联系方式")
private String teacherTel;
/**
* 身份证号 * 身份证号
*/ */
@Excel(name = "身份证号")
private String idCard; private String idCard;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacher/ShebeiJy.java
...@@ -46,4 +46,8 @@ public class ShebeiJy extends OurBaseEntity { ...@@ -46,4 +46,8 @@ public class ShebeiJy extends OurBaseEntity {
@Excel(name = "借用期限") @Excel(name = "借用期限")
private int deadline; private int deadline;
//归还状态（1已归还，0未归还）
@Excel(name = "归还状态", readConverterExp = "1=已归还,0=未归还", combo = {"已归还","未归还"})
private String returnState;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacher/TeacherJy.java
...@@ -52,4 +52,8 @@ public class TeacherJy extends OurBaseEntity { ...@@ -52,4 +52,8 @@ public class TeacherJy extends OurBaseEntity {
@Excel(name = "借用期限") @Excel(name = "借用期限")
private int deadline; private int deadline;
//归还状态（1已归还，0未归还）
@Excel(name = "归还状态", readConverterExp = "1=已归还,0=未归还", combo = {"已归还","未归还"})
private String returnState;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentLedgerMapper.java
...@@ -35,4 +35,11 @@ public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger> ...@@ -35,4 +35,11 @@ public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger>
* @return * @return
*/ */
List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerListGr(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo); List<SchoolEquipmentLedger> selectSchoolEquipmentLedgerListGr(SchoolEquipmentLedgerVo schoolEquipmentLedgerVo);
/**
* 打印设备条码信息
* @param ids
* @return
*/
List<Map<String, Object>> getEquipmentledger(Long[] ids);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacher/SchoolTeacherWagesMapper.java
...@@ -13,4 +13,11 @@ public interface SchoolTeacherWagesMapper extends BaseMapper<SchoolTeacherWages> ...@@ -13,4 +13,11 @@ public interface SchoolTeacherWagesMapper extends BaseMapper<SchoolTeacherWages>
List<SchoolTeacherWages> query(SchoolTeacherWages schoolTeacherWages); List<SchoolTeacherWages> query(SchoolTeacherWages schoolTeacherWages);
/**
* 批量新增教师工资
* @param list
* @return
*/
int batchInsertTeacherWages(List<SchoolTeacherWages> list);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolDcwj/SchoolDcwjNrServiceImpl.java
...@@ -582,6 +582,7 @@ public class SchoolDcwjNrServiceImpl extends ServiceImpl<SchoolDcwjNrMapper, Sch ...@@ -582,6 +582,7 @@ public class SchoolDcwjNrServiceImpl extends ServiceImpl<SchoolDcwjNrMapper, Sch
@Override @Override
public List<ViewDataVo> turnData(List<SchoolDcwjAnVo> list) { public List<ViewDataVo> turnData(List<SchoolDcwjAnVo> list) {
List<ViewDataVo> voList = new ArrayList<>(); List<ViewDataVo> voList = new ArrayList<>();
List<SchoolDcwjNr> schoolDcwjNrs = schoolDcwjNrMapper.selectSchoolDcwjNrList(new SchoolDcwjNr());
for (SchoolDcwjAnVo anVo : list) { for (SchoolDcwjAnVo anVo : list) {
ViewDataVo vo = new ViewDataVo(); ViewDataVo vo = new ViewDataVo();
BeanUtils.copyProperties(anVo, vo); BeanUtils.copyProperties(anVo, vo);
...@@ -591,7 +592,9 @@ public class SchoolDcwjNrServiceImpl extends ServiceImpl<SchoolDcwjNrMapper, Sch ...@@ -591,7 +592,9 @@ public class SchoolDcwjNrServiceImpl extends ServiceImpl<SchoolDcwjNrMapper, Sch
i++; i++;
continue; continue;
} }
SchoolDcwjNr nr = schoolDcwjNrMapper.selectById(an.getNrId()); // SchoolDcwjNr nr = schoolDcwjNrMapper.selectById(an.getNrId());
for (SchoolDcwjNr nr : schoolDcwjNrs) {
if (nr.getId().equals(an.getNrId())){
DataTVo tVo = new DataTVo(); DataTVo tVo = new DataTVo();
tVo.setDatas(an.getUserAnswer()); tVo.setDatas(an.getUserAnswer());
tVo.setType(nr.getNrLx()); tVo.setType(nr.getNrLx());
...@@ -899,6 +902,314 @@ public class SchoolDcwjNrServiceImpl extends ServiceImpl<SchoolDcwjNrMapper, Sch ...@@ -899,6 +902,314 @@ public class SchoolDcwjNrServiceImpl extends ServiceImpl<SchoolDcwjNrMapper, Sch
} }
i++; i++;
} }
}
// DataTVo tVo = new DataTVo();
// tVo.setDatas(an.getUserAnswer());
// tVo.setType(nr.getNrLx());
// switch (i) {
// case 1:
// vo.setT1(tVo);
// break;
// case 2:
// vo.setT2(tVo);
// break;
// case 3:
// vo.setT3(tVo);
// break;
// case 4:
// vo.setT4(tVo);
// break;
// case 5:
// vo.setT5(tVo);
// break;
// case 6:
// vo.setT6(tVo);
// break;
// case 7:
// vo.setT7(tVo);
// break;
// case 8:
// vo.setT8(tVo);
// break;
// case 9:
// vo.setT9(tVo);
// break;
// case 10:
// vo.setT10(tVo);
// break;
// case 11:
// vo.setT11(tVo);
// break;
// case 12:
// vo.setT12(tVo);
// break;
// case 13:
// vo.setT13(tVo);
// break;
// case 14:
// vo.setT14(tVo);
// break;
// case 15:
// vo.setT15(tVo);
// break;
// case 16:
// vo.setT16(tVo);
// break;
// case 17:
// vo.setT17(tVo);
// break;
// case 18:
// vo.setT18(tVo);
// break;
// case 19:
// vo.setT19(tVo);
// break;
// case 20:
// vo.setT20(tVo);
// break;
// case 21:
// vo.setT21(tVo);
// break;
// case 22:
// vo.setT22(tVo);
// break;
// case 23:
// vo.setT23(tVo);
// break;
// case 24:
// vo.setT24(tVo);
// break;
// case 25:
// vo.setT25(tVo);
// break;
// case 26:
// vo.setT26(tVo);
// break;
// case 27:
// vo.setT27(tVo);
// break;
// case 28:
// vo.setT28(tVo);
// break;
// case 29:
// vo.setT29(tVo);
// break;
// case 30:
// vo.setT30(tVo);
// break;
// case 31:
// vo.setT31(tVo);
// break;
// case 32:
// vo.setT32(tVo);
// break;
// case 33:
// vo.setT33(tVo);
// break;
// case 34:
// vo.setT34(tVo);
// break;
// case 35:
// vo.setT35(tVo);
// break;
// case 36:
// vo.setT36(tVo);
// break;
// case 37:
// vo.setT37(tVo);
// break;
// case 38:
// vo.setT38(tVo);
// break;
// case 39:
// vo.setT39(tVo);
// break;
// case 40:
// vo.setT40(tVo);
// break;
// case 41:
// vo.setT41(tVo);
// break;
// case 42:
// vo.setT42(tVo);
// break;
// case 43:
// vo.setT43(tVo);
// break;
// case 44:
// vo.setT44(tVo);
// break;
// case 45:
// vo.setT45(tVo);
// break;
// case 46:
// vo.setT46(tVo);
// break;
// case 47:
// vo.setT47(tVo);
// break;
// case 48:
// vo.setT48(tVo);
// break;
// case 49:
// vo.setT49(tVo);
// break;
// case 50:
// vo.setT50(tVo);
// break;
// case 51:
// vo.setT51(tVo);
// break;
// case 52:
// vo.setT52(tVo);
// break;
// case 53:
// vo.setT53(tVo);
// break;
// case 54:
// vo.setT54(tVo);
// break;
// case 55:
// vo.setT55(tVo);
// break;
// case 56:
// vo.setT56(tVo);
// break;
// case 57:
// vo.setT57(tVo);
// break;
// case 58:
// vo.setT58(tVo);
// break;
// case 59:
// vo.setT59(tVo);
// break;
// case 60:
// vo.setT60(tVo);
// break;
// case 61:
// vo.setT61(tVo);
// break;
// case 62:
// vo.setT62(tVo);
// break;
// case 63:
// vo.setT63(tVo);
// break;
// case 64:
// vo.setT64(tVo);
// break;
// case 65:
// vo.setT65(tVo);
// break;
// case 66:
// vo.setT66(tVo);
// break;
// case 67:
// vo.setT67(tVo);
// break;
// case 68:
// vo.setT68(tVo);
// break;
// case 69:
// vo.setT69(tVo);
// break;
// case 70:
// vo.setT70(tVo);
// break;
// case 71:
// vo.setT71(tVo);
// break;
// case 72:
// vo.setT72(tVo);
// break;
// case 73:
// vo.setT73(tVo);
// break;
// case 74:
// vo.setT74(tVo);
// break;
// case 75:
// vo.setT75(tVo);
// break;
// case 76:
// vo.setT76(tVo);
// break;
// case 77:
// vo.setT77(tVo);
// break;
// case 78:
// vo.setT78(tVo);
// break;
// case 79:
// vo.setT79(tVo);
// break;
// case 80:
// vo.setT80(tVo);
// break;
// case 81:
// vo.setT81(tVo);
// break;
// case 82:
// vo.setT82(tVo);
// break;
// case 83:
// vo.setT83(tVo);
// break;
// case 84:
// vo.setT84(tVo);
// break;
// case 85:
// vo.setT85(tVo);
// break;
// case 86:
// vo.setT86(tVo);
// break;
// case 87:
// vo.setT87(tVo);
// break;
// case 88:
// vo.setT88(tVo);
// break;
// case 89:
// vo.setT89(tVo);
// break;
// case 90:
// vo.setT90(tVo);
// break;
// case 91:
// vo.setT91(tVo);
// break;
// case 92:
// vo.setT92(tVo);
// break;
// case 93:
// vo.setT93(tVo);
// break;
// case 94:
// vo.setT94(tVo);
// break;
// case 95:
// vo.setT95(tVo);
// break;
// case 96:
// vo.setT96(tVo);
// break;
// case 97:
// vo.setT97(tVo);
// break;
// case 98:
// vo.setT98(tVo);
// break;
// case 99:
// vo.setT99(tVo);
// break;
// case 100:
// vo.setT100(tVo);
// break;
// }
// i++;
}
//当学生未填写调查问卷上，如果传给前端的t1.t2等字段未Null，会出错。。。。 //当学生未填写调查问卷上，如果传给前端的t1.t2等字段未Null，会出错。。。。
/* if(StringUtils.isNull(anVo.getList()) || anVo.getList().size() == 0){ /* if(StringUtils.isNull(anVo.getList()) || anVo.getList().size() == 0){
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolDcwj/SchoolDcwjRyServiceImpl.java
...@@ -179,6 +179,13 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -179,6 +179,13 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime); nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime);
List<SchoolDcwjNr> nrs = nrMapper.selectList(nrlqw); List<SchoolDcwjNr> nrs = nrMapper.selectList(nrlqw);
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId)
;
//a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = anMapper.selectList(lqw);
//教师调查问卷回答的内容 //教师调查问卷回答的内容
for (SchoolDcwjAnVo anVo : list) { for (SchoolDcwjAnVo anVo : list) {
List<SchoolDcwjAn> ans = new ArrayList<>(); List<SchoolDcwjAn> ans = new ArrayList<>();
...@@ -187,20 +194,29 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -187,20 +194,29 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值 //获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){ for(SchoolDcwjNr nr : nrs){
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw // lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId) // .eq(SchoolDcwjAn::getDcwjId, dcwjId)
.eq(SchoolDcwjAn::getRyId, anVo.getId()) // .eq(SchoolDcwjAn::getRyId, anVo.getId())
.eq(SchoolDcwjAn::getNrId, nr.getId()) // .eq(SchoolDcwjAn::getNrId, nr.getId())
; // ;
//a里要么有1个值，要么没有值 // //a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = anMapper.selectList(lqw); // List<SchoolDcwjAn> a = anMapper.selectList(lqw);
if(StringUtils.isNotNull(a) && a.size() > 0){
ans.add(a.get(0)); for (SchoolDcwjAn schoolDcwjAn : a) {
if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
ans.add(schoolDcwjAn);
}else { }else {
ans.add(entity); ans.add(entity);
} }
} }
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
}
anVo.setList(ans); anVo.setList(ans);
} }
return list; return list;
...@@ -215,6 +231,13 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -215,6 +231,13 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime); nrlqw.eq(SchoolDcwjNr::getDcwjId, dcwjId).orderByAsc(SchoolDcwjNr::getNrPx).orderByDesc(SchoolDcwjNr::getCreateTime);
List<SchoolDcwjNr> nrs = nrMapper.selectList(nrlqw); List<SchoolDcwjNr> nrs = nrMapper.selectList(nrlqw);
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId)
;
//a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = anMapper.selectList(lqw);
//学生家长调查问卷回答的内容 //学生家长调查问卷回答的内容
for (SchoolDcwjAnVo anVo : list) { for (SchoolDcwjAnVo anVo : list) {
List<SchoolDcwjAn> ans = new ArrayList<>(); List<SchoolDcwjAn> ans = new ArrayList<>();
...@@ -223,20 +246,29 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -223,20 +246,29 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
//获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值 //获取该学生从第一题到最后一题的答案，如果当前题没有答案，，附空值
for(SchoolDcwjNr nr : nrs){ for(SchoolDcwjNr nr : nrs){
LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SchoolDcwjAn> lqw = new LambdaQueryWrapper<>();
lqw // lqw
.eq(SchoolDcwjAn::getDcwjId, dcwjId) // .eq(SchoolDcwjAn::getDcwjId, dcwjId)
.eq(SchoolDcwjAn::getRyId, anVo.getId()) // .eq(SchoolDcwjAn::getRyId, anVo.getId())
.eq(SchoolDcwjAn::getNrId, nr.getId()) // .eq(SchoolDcwjAn::getNrId, nr.getId())
; // ;
//a里要么有1个值，要么没有值 // //a里要么有1个值，要么没有值
List<SchoolDcwjAn> a = anMapper.selectList(lqw); // List<SchoolDcwjAn> a = anMapper.selectList(lqw);
if(StringUtils.isNotNull(a) && a.size() > 0){
ans.add(a.get(0)); for (SchoolDcwjAn schoolDcwjAn : a) {
if (schoolDcwjAn.getRyId().equals(anVo.getId()) && schoolDcwjAn.getNrId().equals(nr.getId())){
ans.add(schoolDcwjAn);
}else { }else {
ans.add(entity); ans.add(entity);
} }
} }
// if(StringUtils.isNotNull(a) && a.size() > 0){
// ans.add(a.get(0));
// }else {
// ans.add(entity);
// }
}
anVo.setList(ans); anVo.setList(ans);
} }
return list; return list;
...@@ -2060,4 +2092,14 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch ...@@ -2060,4 +2092,14 @@ public class SchoolDcwjRyServiceImpl extends ServiceImpl<SchoolDcwjRyMapper, Sch
} }
return list; return list;
} }
@Override
public List<SchoolDcwjAnVo> getTeaAnData(Long dcwjId, SchoolDcwjAnVo vo) {
return schoolDcwjRyMapper.getTeaAnData(dcwjId,vo);
}
@Override
public List<SchoolDcwjAnVo> getAnData1(Long dcwjId, SchoolDcwjAnVo vo) {
return schoolDcwjRyMapper.getAnData(dcwjId,vo);
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java
...@@ -101,6 +101,9 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo ...@@ -101,6 +101,9 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
public int insertSchoolCirculation(SchoolCirculation schoolCirculation) { public int insertSchoolCirculation(SchoolCirculation schoolCirculation) {
//判断该设备是否允许借出 //判断该设备是否允许借出
SchoolEquipmentLedger schoolEquipmentLedger1 = equipmentLedgerMapper.selectById(schoolCirculation.getEquipmentId()); SchoolEquipmentLedger schoolEquipmentLedger1 = equipmentLedgerMapper.selectById(schoolCirculation.getEquipmentId());
if (StringUtils.isNull(schoolEquipmentLedger1)){
throw new ServiceException("未查询到该设备，请重新输入！");
}
if (schoolEquipmentLedger1.getIsAllowLend().equals("0")){ if (schoolEquipmentLedger1.getIsAllowLend().equals("0")){
throw new ServiceException("该设备不允许借出"); throw new ServiceException("该设备不允许借出");
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java
...@@ -19,8 +19,10 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.*; ...@@ -19,8 +19,10 @@ import yangtz.cs.liu.campus.mapper.schoolEquipment.*;
import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService; import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo; import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -223,16 +225,6 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -223,16 +225,6 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
}else if(schoolEquipmentLedger.getClassificationCode().length() < 4){ }else if(schoolEquipmentLedger.getClassificationCode().length() < 4){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、分类编码长度最少为4位，请你核对后重新输入！"); failureMsg.append("<br/>" + failureNum + "、分类编码长度最少为4位，请你核对后重新输入！");
}else if(StringUtils.isNotNull(schoolEquipmentLedger.getClassificationCode())){
//查询分类编码是否重复
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolProductCategory::getClassificationCode,schoolEquipmentLedger.getClassificationCode())
.eq(SchoolProductCategory::getDelFlag,"0");
List<SchoolProductCategory> schoolProductCategories = productCategoryMapper.selectList(wrapper);
if (schoolProductCategories.size()<=0) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、分类编码不存在，请你重新输入！");
}
}else if (StringUtils.isNull(schoolEquipmentLedger.getUnit())){ }else if (StringUtils.isNull(schoolEquipmentLedger.getUnit())){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、单位为空，请你重新输入！"); failureMsg.append("<br/>" + failureNum + "、单位为空，请你重新输入！");
...@@ -260,6 +252,31 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -260,6 +252,31 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
}else if (StringUtils.isNull(schoolEquipmentLedger.getPlace())){ }else if (StringUtils.isNull(schoolEquipmentLedger.getPlace())){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、地点为空，请你重新输入！"); failureMsg.append("<br/>" + failureNum + "、地点为空，请你重新输入！");
}else {
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date dateOfProduction = schoolEquipmentLedger.getDateOfProduction();
sdf.format(dateOfProduction);
} catch (Exception e) {
throw new ServiceException("格式不对，请检查日期格式");
}
try {
Integer.parseInt(schoolEquipmentLedger.getPlace());
throw new ServiceException("地点输入错误，请重新输入！");
} catch (NumberFormatException e) {
e.printStackTrace();
}
}
if(StringUtils.isNotNull(schoolEquipmentLedger.getClassificationCode())){
//查询分类编码是否重复
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolProductCategory::getClassificationCode,schoolEquipmentLedger.getClassificationCode())
.eq(SchoolProductCategory::getDelFlag,"0");
List<SchoolProductCategory> schoolProductCategories = productCategoryMapper.selectList(wrapper);
if (schoolProductCategories.size()<=0) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、分类编码不存在，请你重新输入！");
}
} }
} }
if (failureNum > 0) { if (failureNum > 0) {
...@@ -276,4 +293,14 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -276,4 +293,14 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
public List<Map<String, Object>> getUser(SysUser sysUser) { public List<Map<String, Object>> getUser(SysUser sysUser) {
return equipmentLedgerMapper.getUser(sysUser); return equipmentLedgerMapper.getUser(sysUser);
} }
/**
* 打印设备条码信息
* @param ids
* @return
*/
@Override
public List<Map<String, Object>> getEquipmentledger(Long[] ids) {
return equipmentLedgerMapper.getEquipmentledger(ids);
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -144,7 +145,11 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -144,7 +145,11 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
@Override @Override
public Map<String, String> getEquipment(String encode) { public Map<String, String> getEquipment(String encode) {
// Long userId = SecurityUtils.getLoginUser().getUser().getUserId(); // Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
return equipmentRepairMapper.getEquipment(encode); Map<String, String> equipment = equipmentRepairMapper.getEquipment(encode);
if (StringUtils.isNull(equipment)){
throw new ServiceException("未查询到设备信息，请重新输入设备编号！");
}
return equipment;
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ReceiveServiceImpl.java
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -71,6 +72,14 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive ...@@ -71,6 +72,14 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
*/ */
@Override @Override
public int insertSchoolReceive(SchoolReceive schoolReceive) { public int insertSchoolReceive(SchoolReceive schoolReceive) {
//判断该设备是否允许借出
SchoolEquipmentLedger schoolEquipmentLedger1 = equipmentLedgerMapper.selectById(schoolReceive.getEquipmentId());
if (StringUtils.isNull(schoolEquipmentLedger1)){
throw new ServiceException("未查询到该设备，请重新输入！");
}
if (schoolEquipmentLedger1.getIsAllowLend().equals("0")){
throw new ServiceException("该设备不允许借出");
}
if (StringUtils.isNotNull(schoolReceive.getRecipientById())){ if (StringUtils.isNotNull(schoolReceive.getRecipientById())){
String userName = sysUserMapper.selectUserById(schoolReceive.getRecipientById()).getUserName(); String userName = sysUserMapper.selectUserById(schoolReceive.getRecipientById()).getUserName();
schoolReceive.setRecipientBy(userName); schoolReceive.setRecipientBy(userName);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolbudget/SchoolBudgetDetailsServiceImpl.java
...@@ -139,8 +139,8 @@ public class SchoolBudgetDetailsServiceImpl extends ServiceImpl<SchoolBudgetDeta ...@@ -139,8 +139,8 @@ public class SchoolBudgetDetailsServiceImpl extends ServiceImpl<SchoolBudgetDeta
} }
boolean isMerge = isMergedRegion(sheet, i, 0); boolean isMerge = isMergedRegion(sheet, i, 0);
//schoolBudgetDetails.setBudgetDetailed(row.getCell(6).getStringCellValue()); //schoolBudgetDetails.setBudgetDetailed(row.getCell(6).getStringCellValue());
schoolBudgetDetails.setBudgetDetailed(TemplateExcelUtils.getCellValue(row.getCell(6), workbook)); schoolBudgetDetails.setBudgetDetailed(TemplateExcelUtils.getCellValue(row.getCell(7), workbook));
schoolBudgetDetails.setMoneyDetailed(new BigDecimal(new DataFormatter().formatCellValue(row.getCell(7)))); schoolBudgetDetails.setMoneyDetailed(new BigDecimal(new DataFormatter().formatCellValue(row.getCell(8))));
if(isMerge){ //如果是合并单元格 if(isMerge){ //如果是合并单元格
isSameCell = isSameMergeRegion(sheet,i,0); //判断与上一行是否为同一单元格 isSameCell = isSameMergeRegion(sheet,i,0); //判断与上一行是否为同一单元格
if(!isSameCell){ if(!isSameCell){
...@@ -157,14 +157,14 @@ public class SchoolBudgetDetailsServiceImpl extends ServiceImpl<SchoolBudgetDeta ...@@ -157,14 +157,14 @@ public class SchoolBudgetDetailsServiceImpl extends ServiceImpl<SchoolBudgetDeta
schoolBudget.setBudgetName(budgetName); schoolBudget.setBudgetName(budgetName);
giveMoney = getMergedRegionValue(sheet, row.getRowNum(), 3); giveMoney = getMergedRegionValue(sheet, row.getRowNum(), 3);
schoolBudget.setGiveMoney(new BigDecimal(giveMoney)); schoolBudget.setGiveMoney(new BigDecimal(giveMoney));
isGov = getMergedRegionValue(sheet, row.getRowNum(), 4); isGov = getMergedRegionValue(sheet, row.getRowNum(), 5);
if(isGov.equals("是")){ if(isGov.equals("是")){
schoolBudget.setIsGov("0"); schoolBudget.setIsGov("0");
} }
if(isGov.equals("否")){ if(isGov.equals("否")){
schoolBudget.setIsGov("1"); schoolBudget.setIsGov("1");
} }
remark = getMergedRegionValue(sheet, row.getRowNum(), 5); remark = getMergedRegionValue(sheet, row.getRowNum(), 6);
schoolBudget.setRemark(remark); schoolBudget.setRemark(remark);
schoolBudgetMapper.insert(schoolBudget); schoolBudgetMapper.insert(schoolBudget);
budgetId = schoolBudget.getId(); budgetId = schoolBudget.getId();
...@@ -182,14 +182,14 @@ public class SchoolBudgetDetailsServiceImpl extends ServiceImpl<SchoolBudgetDeta ...@@ -182,14 +182,14 @@ public class SchoolBudgetDetailsServiceImpl extends ServiceImpl<SchoolBudgetDeta
schoolBudget.setDeptId(deptId); schoolBudget.setDeptId(deptId);
schoolBudget.setBudgetName(new DataFormatter().formatCellValue(row.getCell(2))); schoolBudget.setBudgetName(new DataFormatter().formatCellValue(row.getCell(2)));
schoolBudget.setGiveMoney(new BigDecimal(new DataFormatter().formatCellValue(row.getCell(3)))); schoolBudget.setGiveMoney(new BigDecimal(new DataFormatter().formatCellValue(row.getCell(3))));
isGov = new DataFormatter().formatCellValue(row.getCell(4)); isGov = new DataFormatter().formatCellValue(row.getCell(5));
if(isGov.equals("是")){ if(isGov.equals("是")){
schoolBudget.setIsGov("0"); schoolBudget.setIsGov("0");
} }
if(isGov.equals("否")){ if(isGov.equals("否")){
schoolBudget.setIsGov("1"); schoolBudget.setIsGov("1");
} }
schoolBudget.setRemark(new DataFormatter().formatCellValue(row.getCell(5))); schoolBudget.setRemark(new DataFormatter().formatCellValue(row.getCell(6)));
schoolBudgetMapper.insert(schoolBudget); schoolBudgetMapper.insert(schoolBudget);
schoolBudgetDetails.setBudgetId(schoolBudget.getId()); schoolBudgetDetails.setBudgetId(schoolBudget.getId());
schoolBudgetDetailsMapper.insert(schoolBudgetDetails); schoolBudgetDetailsMapper.insert(schoolBudgetDetails);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/student/SchoolStudentServiceImpl.java
...@@ -116,15 +116,24 @@ public class SchoolStudentServiceImpl extends ServiceImpl<SchoolStudentMapper, S ...@@ -116,15 +116,24 @@ public class SchoolStudentServiceImpl extends ServiceImpl<SchoolStudentMapper, S
if (isNull(list) || list.size() == 0) { if (isNull(list) || list.size() == 0) {
return new ArrayList<>(); return new ArrayList<>();
} }
for (SchoolStudentVO vo : list) { //获取所有学生家长
LambdaQueryWrapper<SchoolStudentParent> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SchoolStudentParent> lqw = new LambdaQueryWrapper<>();
lqw.eq(SchoolStudentParent::getStudentId, vo.getId()) lqw.orderByDesc(SchoolStudentParent::getCreateTime);
.orderByDesc(SchoolStudentParent::getCreateTime); List<SchoolStudentParent> studentParentList = schoolStudentParentMapper.selectList(lqw);
List<SchoolStudentParent> parentList = schoolStudentParentMapper.selectList(lqw); for (SchoolStudentVO vo : list) {
// LambdaQueryWrapper<SchoolStudentParent> lqw = new LambdaQueryWrapper<>();
// lqw.eq(SchoolStudentParent::getStudentId, vo.getId())
// .orderByDesc(SchoolStudentParent::getCreateTime);
// List<SchoolStudentParent> parentList = schoolStudentParentMapper.selectList(lqw);
List<SchoolStudentParent> parentList = new ArrayList<>();
for (SchoolStudentParent studentParent : studentParentList) {
if (vo.getId().equals(studentParent.getStudentId())){
parentList.add(studentParent);
}
}
if (isNull(parentList) || parentList.size() == 0) { if (isNull(parentList) || parentList.size() == 0) {
continue; continue;
} }
//获取学生家长，至多2人 //获取学生家长，至多2人
int i = 1; int i = 1;
for (SchoolStudentParent parent : parentList) { for (SchoolStudentParent parent : parentList) {
...@@ -172,22 +181,46 @@ public class SchoolStudentServiceImpl extends ServiceImpl<SchoolStudentMapper, S ...@@ -172,22 +181,46 @@ public class SchoolStudentServiceImpl extends ServiceImpl<SchoolStudentMapper, S
List<SchoolStudentVO> list = new ArrayList<>(); List<SchoolStudentVO> list = new ArrayList<>();
List<SchoolStudent> studentList = schoolStudentMapper.selectBatchIds(ids); List<SchoolStudent> studentList = schoolStudentMapper.selectBatchIds(ids);
//获取所有班级
List<SchoolClass> schoolClasses = schoolClassMapper.selectList(new LambdaQueryWrapper<>());
//获取所有家长
LambdaQueryWrapper<SchoolStudentParent> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(SchoolStudentParent::getCreateTime);
List<SchoolStudentParent> studentParentList = schoolStudentParentMapper.selectList(lqw);
for (SchoolStudent student : studentList) { for (SchoolStudent student : studentList) {
SchoolStudentVO vo = new SchoolStudentVO(); SchoolStudentVO vo = new SchoolStudentVO();
BeanUtils.copyProperties(student, vo); BeanUtils.copyProperties(student, vo);
//学年年级班级 for (SchoolClass schoolClass : schoolClasses) {
SchoolClass theClass = schoolClassMapper.selectById(student.getClassId()); if (schoolClass.getId().equals(student.getClassId())){
if (isNotNull(theClass)) { vo.setSchoolYear(schoolClass.getSchoolYear());
vo.setSchoolYear(theClass.getSchoolYear()); vo.setGradeValue(schoolClass.getGradeValue());
vo.setGradeValue(theClass.getGradeValue()); vo.setClassValue(schoolClass.getClassValue());
vo.setClassValue(theClass.getClassValue());
} }
}
// //学年年级班级
// SchoolClass theClass = schoolClassMapper.selectById(student.getClassId());
// if (isNotNull(theClass)) {
// vo.setSchoolYear(theClass.getSchoolYear());
// vo.setGradeValue(theClass.getGradeValue());
// vo.setClassValue(theClass.getClassValue());
// }
//家长信息 //家长信息
LambdaQueryWrapper<SchoolStudentParent> lqw = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SchoolStudentParent> lqw = new LambdaQueryWrapper<>();
lqw.eq(SchoolStudentParent::getStudentId, student.getId()) // lqw.eq(SchoolStudentParent::getStudentId, student.getId())
.orderByDesc(SchoolStudentParent::getCreateTime); // .orderByDesc(SchoolStudentParent::getCreateTime);
List<SchoolStudentParent> parentList = schoolStudentParentMapper.selectList(lqw); // List<SchoolStudentParent> parentList = schoolStudentParentMapper.selectList(lqw);
List<SchoolStudentParent> parentList = new ArrayList<>();
for (SchoolStudentParent studentParent : studentParentList) {
if (vo.getId().equals(studentParent.getStudentId())){
parentList.add(studentParent);
}
}
if (isNull(parentList) || parentList.size() == 0) { if (isNull(parentList) || parentList.size() == 0) {
list.add(vo); list.add(vo);
continue; continue;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacher/SchoolTeacherWagesServiceImpl.java
...@@ -16,6 +16,7 @@ import yangtz.cs.liu.campus.mapper.teacher.SchoolTeacherWagesMapper; ...@@ -16,6 +16,7 @@ import yangtz.cs.liu.campus.mapper.teacher.SchoolTeacherWagesMapper;
import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherWagesService; import yangtz.cs.liu.campus.service.teacher.ISchoolTeacherWagesService;
import yangtz.cs.liu.campus.vo.student.SchoolTeacherWagesVO; import yangtz.cs.liu.campus.vo.student.SchoolTeacherWagesVO;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -123,7 +124,7 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage ...@@ -123,7 +124,7 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage
public int insertByTeacherId(Long teacherId,SchoolTeacherWages schoolTeacherWages) { public int insertByTeacherId(Long teacherId,SchoolTeacherWages schoolTeacherWages) {
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectById(teacherId); SchoolTeacher schoolTeacher = schoolTeacherMapper.selectById(teacherId);
schoolTeacherWages.setTeacherName(schoolTeacher.getTeacherName()); schoolTeacherWages.setTeacherName(schoolTeacher.getTeacherName());
schoolTeacherWages.setIdCard(schoolTeacher.getIdCard()); schoolTeacherWages.setTeacherTel(schoolTeacher.getTeacherTel());
return schoolTeacherWagesMapper.insert(schoolTeacherWages); return schoolTeacherWagesMapper.insert(schoolTeacherWages);
} }
...@@ -143,12 +144,10 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage ...@@ -143,12 +144,10 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage
if (StringUtils.isEmpty(schoolTeacherWages.getTeacherName())) { if (StringUtils.isEmpty(schoolTeacherWages.getTeacherName())) {
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、教师姓名为空,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、教师姓名为空,请您重新输入! ");
} } else if (StringUtils.isEmpty(schoolTeacherWages.getTeacherTel())) {
// else if (StringUtils.isEmpty(schoolTeacherWages.getIdCard())) { failureNum++;
// failureNum++; failureMsg.append("<br/>" + failureNum + "、教师联系方式为空,请您重新输入! ");
// failureMsg.append("<br/>" + failureNum + "、身份证号为空,请您重新输入! "); } else if (StringUtils.isNull(schoolTeacherWages.getWagesTime())) {
// }
else if (StringUtils.isNull(schoolTeacherWages.getWagesTime())) {
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、工资日期为空，请您重新输入！"); failureMsg.append("<br/>" + failureNum + "、工资日期为空，请您重新输入！");
} else if (isNotNull(schoolTeacherWages.getWagesTime())) { } else if (isNotNull(schoolTeacherWages.getWagesTime())) {
...@@ -159,15 +158,62 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage ...@@ -159,15 +158,62 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("格式不对，请检查日期格式"); throw new ServiceException("格式不对，请检查日期格式");
} }
}else { }
LambdaQueryWrapper<SchoolTeacherWages> lqw = new LambdaQueryWrapper<>(); // else {
// LambdaQueryWrapper<SchoolTeacherWages> lqw = new LambdaQueryWrapper<>();
// lqw
// .eq(SchoolTeacherWages::getTeacherTel, schoolTeacherWages.getTeacherTel());
// SchoolTeacherWages teacherWages = schoolTeacherWagesMapper.selectOne(lqw);
// if (isNull(teacherWages)){
// failureNum++;
// failureMsg.append("<br/>" + failureNum + "、该老师不存在,请您重新输入! ");
// }
// }
if (StringUtils.isNull(schoolTeacherWages.getBasePay())) {
schoolTeacherWages.setBasePay(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getBonus())) {
schoolTeacherWages.setBonus(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getPension())) {
schoolTeacherWages.setPension(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getAccumulationFund())) {
schoolTeacherWages.setAccumulationFund(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getMedicalInsurance())) {
schoolTeacherWages.setMedicalInsurance(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getFareSubsidy())) {
schoolTeacherWages.setFareSubsidy(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getTelephoneSubsidy())) {
schoolTeacherWages.setTelephoneSubsidy(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getMealAllowance())) {
schoolTeacherWages.setMealAllowance(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getIncomeTax())) {
schoolTeacherWages.setIncomeTax(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getUnemploymentBenefits())) {
schoolTeacherWages.setUnemploymentBenefits(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getOvertimePay())) {
schoolTeacherWages.setOvertimePay(new BigDecimal(0));
}
if (StringUtils.isNull(schoolTeacherWages.getRemarks())) {
schoolTeacherWages.setRemarks("");
}
LambdaQueryWrapper<SchoolTeacher> lqw = new LambdaQueryWrapper<>();
lqw lqw
.eq(SchoolTeacherWages::getIdCard, schoolTeacherWages.getIdCard()); .eq(SchoolTeacher::getTeacherTel, schoolTeacherWages.getTeacherTel());
SchoolTeacherWages teacherWages = schoolTeacherWagesMapper.selectOne(lqw); SchoolTeacher schoolTeacher = schoolTeacherMapper.selectOne(lqw);
if (isNull(teacherWages)){ if (isNull(schoolTeacher)){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、该老师不存在,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、该老师不存在,请您重新输入! ");
} }else {
schoolTeacherWages.setTeacherId(schoolTeacher.getId());
} }
} }
if (failureNum > 0) { if (failureNum > 0) {
...@@ -186,16 +232,19 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage ...@@ -186,16 +232,19 @@ public class SchoolTeacherWagesServiceImpl extends ServiceImpl<SchoolTeacherWage
// 准备记录日志数据 // 准备记录日志数据
int successNum = 0; int successNum = 0;
StringBuilder successMsg = new StringBuilder(); StringBuilder successMsg = new StringBuilder();
for (SchoolTeacherWages schoolTeacherWages : list) {
try { schoolTeacherWagesMapper.batchInsertTeacherWages(list);
schoolTeacherWagesMapper.insert(schoolTeacherWages);
successNum++; // for (SchoolTeacherWages schoolTeacherWages : list) {
successMsg.append("<br/>" + successNum + "数据" + " 导入成功"); // try {
} catch (Exception e) { // schoolTeacherWagesMapper.insert(schoolTeacherWages);
throw new ServiceException("导入失败"); // successNum++;
} // successMsg.append("<br/>" + successNum + "数据" + " 导入成功");
} // } catch (Exception e) {
successMsg.insert(0, "恭喜您，数据已导入成功！共有 " + successNum + " 条，数据如下："); // throw new ServiceException("导入失败");
// }
// }
successMsg.insert(0, "恭喜您，数据已导入成功！");
return successMsg.toString(); return successMsg.toString();
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolDcwj/ISchoolDcwjRyService.java
...@@ -91,4 +91,8 @@ public interface ISchoolDcwjRyService extends IService<SchoolDcwjRy> ...@@ -91,4 +91,8 @@ public interface ISchoolDcwjRyService extends IService<SchoolDcwjRy>
//班主任-问卷结果-统计 //班主任-问卷结果-统计
public List<DataCountVo> getHeaderCount(Long id,List<Long> studentIds); public List<DataCountVo> getHeaderCount(Long id,List<Long> studentIds);
List<SchoolDcwjAnVo> getTeaAnData(Long dcwjId, SchoolDcwjAnVo vo);
List<SchoolDcwjAnVo> getAnData1(Long dcwjId, SchoolDcwjAnVo vo);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentLedgerService.java
...@@ -70,4 +70,10 @@ public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger> ...@@ -70,4 +70,10 @@ public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger>
*/ */
List<Map<String,Object>> getUser(SysUser sysUser); List<Map<String,Object>> getUser(SysUser sysUser);
/**
* 打印设备条码信息
* @param ids
* @return
*/
List<Map<String, Object>> getEquipmentledger(Long[] ids);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolCirculationVo.java
...@@ -86,13 +86,12 @@ public class SchoolCirculationVo extends BaseEntity ...@@ -86,13 +86,12 @@ public class SchoolCirculationVo extends BaseEntity
/** 预计使用时间 */ /** 预计使用时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "预计使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "预计使用期限", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date yjuseTime; private Date yjuseTime;
/** 实际使用时间 */ /** 实际使用时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "实际使用时间")
@Excel(name = "实际使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Long sjuseTime;
private Date sjuseTime;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentLedgerDcVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.schoolEquipment;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 设备台账对象 school_equipment_ledger
*
* @author ruoyi
* @date 2023-08-09
*/
@Data
public class SchoolEquipmentLedgerDcVo extends OurBaseEntity
{
@Excel(name = "序号")
private Integer serialNumber;
/** 自编码 */
@Excel(name = "设备名称")
private String encode;
/** 设备名称 */
@Excel(name = "设备名称")
private String equipmentName;
/** 型号 */
@Excel(name = "型号")
private String model;
/** 规格 */
@Excel(name = "规格")
private String specification;
/** 分类编码 */
@Excel(name = "分类编码")
private String classificationCode;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 归属类型（1公共区域，2信息中心，3个人） */
@Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人", combo = {"公共区域","信息中心","个人"})
private String affiliationType;
/** 设备状态（1完好，2损坏，3报废） */
@Excel(name = "设备状态", readConverterExp = "1=完好,2=损坏,3=报废", combo = {"完好","损坏","报废"})
private String equipmentState;
/** 是否允许借出（1是，0否） */
@Excel(name = "是否允许借出", readConverterExp = "1=是,0=否", combo = {"是","否"})
private String isAllowLend;
/** 是否已借出（1是，0否） */
@Excel(name = "是否已借出", readConverterExp = "1=是,0=否", combo = {"是","否"})
private String isLend;
/** 投产日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "投产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date dateOfProduction;
/** 价格 */
@Excel(name = "价格(元)")
private BigDecimal price;
/** 效用年限（年） */
@Excel(name = "效用年限(年)")
private String lifeOfUtility;
/** 地点 */
@Excel(name = "地点")
private String place;
/** 使用人id */
@TableField(fill = FieldFill.UPDATE)
private Long useId;
/** 使用人 */
@TableField(fill = FieldFill.UPDATE)
@Excel(name = "使用人")
private String useName;
/** 备注 */
@Excel(name = "备注")
private String remark;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/student/StudentLeaveVO.java
...@@ -104,6 +104,7 @@ public class StudentLeaveVO extends ProcessBaseEntity { ...@@ -104,6 +104,7 @@ public class StudentLeaveVO extends ProcessBaseEntity {
private String handUserName; private String handUserName;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
......
smart-campus/src/main/resources/mapper/schoolEquipment/CirculationMapper.xml
...@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if> <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="borrowTime != null">and DATE_FORMAT(c.borrow_time,'%Y-%m-%d') = DATE_FORMAT(#{borrowTime},'%Y-%m-%d')</if> <if test="borrowTime != null">and DATE_FORMAT(c.borrow_time,'%Y-%m-%d') = DATE_FORMAT(#{borrowTime},'%Y-%m-%d')</if>
<if test="borrowById != null">and c.borrow_by_id = #{borrowById}</if> <if test="borrowById != null">and c.borrow_by_id = #{borrowById}</if>
order by c.create_time DESC
</select> </select>
<select id="selectSchoolCirculationVoListGr" parameterType="SchoolCirculationVo" resultMap="schoolCirculationVoResult"> <select id="selectSchoolCirculationVoListGr" parameterType="SchoolCirculationVo" resultMap="schoolCirculationVoResult">
...@@ -99,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -99,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if> <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="borrowTime != null">and DATE_FORMAT(c.borrow_time,,'%Y-%m-%d') = DATE_FORMAT(#{borrowTime},'%Y-%m-%d')</if> <if test="borrowTime != null">and DATE_FORMAT(c.borrow_time,,'%Y-%m-%d') = DATE_FORMAT(#{borrowTime},'%Y-%m-%d')</if>
<if test="borrowById != null">and c.borrow_by_id = #{borrowById}</if> <if test="borrowById != null">and c.borrow_by_id = #{borrowById}</if>
order by c.create_time DESC
</select> </select>
<select id="selectSchoolCirculationVoById" parameterType="Long" resultMap="schoolCirculationVoResult"> <select id="selectSchoolCirculationVoById" parameterType="Long" resultMap="schoolCirculationVoResult">
......
smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentLedgerMapper.xml
...@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if> <if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if>
<if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if> <if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if>
order by el.create_time DESC
</select> </select>
<select id="selectSchoolEquipmentLedgerListGr" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult"> <select id="selectSchoolEquipmentLedgerListGr" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult">
...@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if> <if test="equipmentState != null and equipmentState != ''" >and el.equipment_state = #{equipmentState}</if>
<if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if> <if test="affiliationType != null and affiliationType != ''" >and el.affiliation_type = #{affiliationType}</if>
order by el.create_time DESC
</select> </select>
<update id="outSchoolEquipmentLedger" parameterType="String"> <update id="outSchoolEquipmentLedger" parameterType="String">
...@@ -79,4 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -79,4 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND user_name like concat('%', #{userName}, '%') AND user_name like concat('%', #{userName}, '%')
</if> </if>
</select> </select>
<select id="getEquipmentledger" parameterType="String" resultType="Map">
select id as id, encode as encode, equipment_name as equipmentName, model as model, place as place from school_equipment_ledger where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</select>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentRepairMapper.xml
...@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if> <if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if>
<if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if> <if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if>
order by er.create_time DESC
</select> </select>
<select id="selectSchoolEquipmentRepairVoListGr" parameterType="SchoolEquipmentRepairVo" resultMap="schoolEquipmentRepairVoResult"> <select id="selectSchoolEquipmentRepairVoListGr" parameterType="SchoolEquipmentRepairVo" resultMap="schoolEquipmentRepairVoResult">
...@@ -100,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''" >and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if> <if test="repairState != null and repairState != ''">and er.repair_state = #{repairState}</if>
<if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if> <if test="disposeState != null and disposeState != ''">and er.dispose_state = #{disposeState}</if>
order by er.create_time DESC
</select> </select>
...@@ -110,7 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -110,7 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id
where er.del_flag=0 where er.del_flag=0
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if> <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
</select> </select>
...@@ -177,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -177,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
school_equipment_ledger school_equipment_ledger
WHERE WHERE
encode = #{encode} encode = #{encode}
and del_flag = '0'
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolEquipment/InStockMapper.xml
...@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if> <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
<if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if> <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
order by i.create_time DESC
</select> </select>
<select id="selectSchoolInStockVoListGr" parameterType="SchoolInStockVo" resultMap="schoolInStockVoResult"> <select id="selectSchoolInStockVoListGr" parameterType="SchoolInStockVo" resultMap="schoolInStockVoResult">
...@@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if> <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
<if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if> <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
order by i.create_time DESC
</select> </select>
<select id="selectSchoolInStockVoById" parameterType="Long" resultMap="schoolInStockVoResult"> <select id="selectSchoolInStockVoById" parameterType="Long" resultMap="schoolInStockVoResult">
......
smart-campus/src/main/resources/mapper/schoolEquipment/OutStockMapper.xml
...@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if> <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
<if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if> <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
order by create_time DESC
</select> </select>
<select id="selectSchoolOutStockVoListGr" parameterType="SchoolOutStockVo" resultMap="schoolOutStockVoResult"> <select id="selectSchoolOutStockVoListGr" parameterType="SchoolOutStockVo" resultMap="schoolOutStockVoResult">
...@@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if> <if test="affiliationType != null and affiliationType != ''">and el.affiliation_type = #{affiliationType}</if>
<if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if> <if test="classificationCode != null and classificationCode != ''">and el.classification_code like concat('%', #{classificationCode}, '%')</if>
<if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if> <if test="equipmentState != null and equipmentState != ''">and el.equipment_state = #{equipmentState}</if>
order by create_time DESC
</select> </select>
<select id="selectSchoolOutStockVoById" parameterType="Long" resultMap="schoolOutStockVoResult"> <select id="selectSchoolOutStockVoById" parameterType="Long" resultMap="schoolOutStockVoResult">
......
smart-campus/src/main/resources/mapper/schoolEquipment/ReceiveMapper.xml
...@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.del_flag = '0' r.del_flag = '0'
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if> <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if> <if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if>
order by r.create_time DESC
</select> </select>
<select id="selectSchoolReceiveVoListGr" parameterType="SchoolReceiveVo" resultMap="schoolReceiveVoResult"> <select id="selectSchoolReceiveVoListGr" parameterType="SchoolReceiveVo" resultMap="schoolReceiveVoResult">
...@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.del_flag = '0' and u.user_id = #{adminId} r.del_flag = '0' and u.user_id = #{adminId}
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if> <if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if> <if test="recipientBy != null and recipientBy != ''">and r.recipient_by like concat('%', #{recipientBy}, '%')</if>
order by r.create_time DESC
</select> </select>
<select id="selectSchoolReceiveVoById" parameterType="Long" resultMap="schoolReceiveVoResult"> <select id="selectSchoolReceiveVoById" parameterType="Long" resultMap="schoolReceiveVoResult">
......
smart-campus/src/main/resources/mapper/teacher/SchoolTeacherWagesMapper.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<result property="id" column="id" /> <result property="id" column="id" />
<result property="teacherId" column="teacher_id" /> <result property="teacherId" column="teacher_id" />
<result property="teacherName" column="teacher_name" /> <result property="teacherName" column="teacher_name" />
<result property="teacherTel" column="teacher_tel" />
<result property="idCard" column="id_card" /> <result property="idCard" column="id_card" />
<result property="basePay" column="base_pay" /> <result property="basePay" column="base_pay" />
<result property="bonus" column="bonus" /> <result property="bonus" column="bonus" />
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
</resultMap> </resultMap>
<sql id="selectSchoolTeacherWagesVo"> <sql id="selectSchoolTeacherWagesVo">
select id, teacher_id, teacher_name, id_card, base_pay, bonus, pension, accumulation_fund, medical_insurance, fare_subsidy, telephone_subsidy, meal_allowance, income_tax, unemployment_benefits, overtime_pay, pay_slip_url, wages_time, remarks from school_teacher_wages select id, teacher_id, teacher_name, teacher_tel, id_card, base_pay, bonus, pension, accumulation_fund, medical_insurance, fare_subsidy, telephone_subsidy, meal_allowance, income_tax, unemployment_benefits, overtime_pay, pay_slip_url, wages_time, remarks from school_teacher_wages
</sql> </sql>
<select id="queryList" parameterType="SchoolTeacherWages" resultMap="SchoolTeacherWagesResult"> <select id="queryList" parameterType="SchoolTeacherWages" resultMap="SchoolTeacherWagesResult">
...@@ -55,4 +56,15 @@ ...@@ -55,4 +56,15 @@
order by create_time desc order by create_time desc
</select> </select>
<insert id="batchInsertTeacherWages">
insert into school_teacher_wages(teacher_id, teacher_name, teacher_tel, base_pay, bonus, pension, accumulation_fund, medical_insurance,
fare_subsidy, telephone_subsidy, meal_allowance, income_tax, unemployment_benefits, overtime_pay, wages_time, remarks, create_by, create_time )
values
<foreach collection="list" item="item" separator=",">
(#{item.teacherId}, #{item.teacherName}, #{item.teacherTel}, #{item.basePay}, #{item.bonus}, #{item.pension}, #{item.accumulationFund},
#{item.medicalInsurance}, #{item.fareSubsidy}, #{item.telephoneSubsidy}, #{item.mealAllowance}, #{item.incomeTax}, #{item.unemploymentBenefits},
#{item.overtimePay}, #{item.wagesTime}, #{item.remarks}, #{item.createBy}, #{item.createTime})
</foreach>
</insert>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/teacher/ShebeiBxMapper.xml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<select id="shebeilist2" parameterType="ShebeiBx" resultMap="ShebeiBxResult"> <select id="shebeilist2" parameterType="ShebeiBx" resultMap="ShebeiBxResult">
SELECT ser.id,encode,equipment_name,model,date_of_production,place,report_repair_time,problem,repair_name,repair_id,repair_time,repair_state,evaluate,ser.remark SELECT ser.id,encode,report_repair_id,equipment_name,model,date_of_production,ser.place,report_repair_time,report_repair,problem,repair_name,repair_id,repair_time,repair_state,evaluate,ser.remark
FROM school_equipment_repair ser FROM school_equipment_repair ser
JOIN school_equipment_ledger sel JOIN school_equipment_ledger sel
ON ser.equipment_id=sel.id ON ser.equipment_id=sel.id
......
smart-campus/src/main/resources/mapper/teacher/ShebeiJyMapper.xml
...@@ -14,11 +14,12 @@ ...@@ -14,11 +14,12 @@
<result property="borrowBy" column="borrow_by"/> <result property="borrowBy" column="borrow_by"/>
<result property="purpose" column="purpose"/> <result property="purpose" column="purpose"/>
<result property="deadline" column="deadline"/> <result property="deadline" column="deadline"/>
<result property="returnState" column="return_state"/>
</resultMap> </resultMap>
<select id="shebeilist" parameterType="ShebeiJy" resultMap="ShebeiJyResult"> <select id="shebeilist" parameterType="ShebeiJy" resultMap="ShebeiJyResult">
SELECT ss.id,encode,equipment_name,model,borrow_time,borrow_by_id,borrow_by,deadline,purpose SELECT ss.id,encode,equipment_name,model,borrow_time,borrow_by_id,borrow_by,deadline,purpose,ss.return_state
FROM school_circulation ss FROM school_circulation ss
JOIN school_equipment_ledger ssc JOIN school_equipment_ledger ssc
ON ss.equipment_id=ssc.id ON ss.equipment_id=ssc.id
......
smart-campus/src/main/resources/mapper/teacher/TeacherBxMapper.xml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</resultMap> </resultMap>
<select id="querylistbx" parameterType="TeacherBx" resultMap="TeacherBxResult"> <select id="querylistbx" parameterType="TeacherBx" resultMap="TeacherBxResult">
SELECT ser.id,encode,equipment_name,model,date_of_production,place,report_repair_time,report_repair,problem,repair_name,repair_id,repair_time,repair_state,evaluate,ser.remark SELECT ser.id,encode,equipment_name,model,date_of_production,ser.place,report_repair_time,report_repair,problem,repair_name,repair_id,repair_time,repair_state,evaluate,ser.remark
FROM school_equipment_repair ser FROM school_equipment_repair ser
JOIN school_equipment_ledger sel JOIN school_equipment_ledger sel
ON ser.equipment_id=sel.id ON ser.equipment_id=sel.id
......
smart-campus/src/main/resources/mapper/teacher/TeacherJyMapper.xml
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
<result property="borrowBy" column="borrow_by"/> <result property="borrowBy" column="borrow_by"/>
<result property="purpose" column="purpose"/> <result property="purpose" column="purpose"/>
<result property="deadline" column="deadline"/> <result property="deadline" column="deadline"/>
<result property="returnState" column="return_state"/>
</resultMap> </resultMap>
<select id="queryList" parameterType="TeacherJy" resultMap="TeacherJyResult"> <select id="queryList" parameterType="TeacherJy" resultMap="TeacherJyResult">
SELECT ss.id,encode,equipment_name,model,borrow_time,borrow_by_id,borrow_by,deadline,purpose SELECT ss.id,encode,equipment_name,model,borrow_time,borrow_by_id,borrow_by,deadline,purpose,ss.return_state
FROM school_circulation ss FROM school_circulation ss
JOIN school_equipment_ledger ssc JOIN school_equipment_ledger ssc
ON ss.equipment_id=ssc.id ON ss.equipment_id=ssc.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment