Skip to content

D
dd_school
Commit 063e4e48 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:xhxy/smart_school

parents 985533a1 43db23c0
Showing with 137 additions and 47 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEquipmentRepair.java
...@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolEquipment; ...@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolEquipment;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity; import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
...@@ -17,6 +19,7 @@ public class SchoolEquipmentRepair extends OurBaseEntity ...@@ -17,6 +19,7 @@ public class SchoolEquipmentRepair extends OurBaseEntity
{ {
/** 设备id */ /** 设备id */
@TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** 设备id */ /** 设备id */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolReceive.java
...@@ -25,7 +25,7 @@ public class SchoolReceive extends OurBaseEntity ...@@ -25,7 +25,7 @@ public class SchoolReceive extends OurBaseEntity
private Date recipientTime; private Date recipientTime;
/** 领用人id */ /** 领用人id */
private String recipientById; private Long recipientById;
/** 领用人 */ /** 领用人 */
private String recipientBy; private String recipientBy;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentRepairMapper.java
...@@ -56,7 +56,7 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> ...@@ -56,7 +56,7 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair>
* @param * @param
* @return * @return
*/ */
Map<String, String> getEquipment(@Param("encode") String encode,@Param("adminId") Long adminId); Map<String, String> getEquipment(@Param("encode") String encode);
/** /**
* 删除设备报修 * 删除设备报修
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java
...@@ -3,6 +3,9 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment; ...@@ -3,6 +3,9 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -19,6 +22,9 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo ...@@ -19,6 +22,9 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
@Autowired @Autowired
private CirculationMapper circulationMapper; private CirculationMapper circulationMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Override @Override
public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) { public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
return circulationMapper.getReturningEquipmentByadminId(userId); return circulationMapper.getReturningEquipmentByadminId(userId);
...@@ -36,7 +42,7 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo ...@@ -36,7 +42,7 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
* @return * @return
*/ */
@Override @Override
// @DataScope(userAlias = "u") @DataScope(userAlias = "u")
public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) { public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo); return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
} }
...@@ -59,8 +65,18 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo ...@@ -59,8 +65,18 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
@Override @Override
@Transactional @Transactional
public int insertSchoolCirculation(SchoolCirculation schoolCirculation) { public int insertSchoolCirculation(SchoolCirculation schoolCirculation) {
schoolCirculation.setBorrowTime(DateUtils.getNowDate()); if (StringUtils.isNotNull(schoolCirculation.getBorrowById())){
String userName = sysUserMapper.selectUserById(schoolCirculation.getBorrowById()).getUserName();
schoolCirculation.setBorrowBy(userName);
}
if (StringUtils.isNotNull(schoolCirculation.getReceivedById())){
String userName = sysUserMapper.selectUserById(schoolCirculation.getReceivedById()).getUserName();
schoolCirculation.setReceivedBy(userName);
}
schoolCirculation.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolCirculation.setCreateTime(DateUtils.getNowDate());
return circulationMapper.insert(schoolCirculation); return circulationMapper.insert(schoolCirculation);
} }
/** /**
...@@ -70,6 +86,16 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo ...@@ -70,6 +86,16 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
*/ */
@Override @Override
public int updateSchoolCirculation(SchoolCirculation schoolCirculation) { public int updateSchoolCirculation(SchoolCirculation schoolCirculation) {
if (StringUtils.isNotNull(schoolCirculation.getBorrowById())){
String userName = sysUserMapper.selectUserById(schoolCirculation.getBorrowById()).getUserName();
schoolCirculation.setBorrowBy(userName);
}
if (StringUtils.isNotNull(schoolCirculation.getReceivedById())){
String userName = sysUserMapper.selectUserById(schoolCirculation.getReceivedById()).getUserName();
schoolCirculation.setReceivedBy(userName);
}
schoolCirculation.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolCirculation.setUpdateTime(DateUtils.getNowDate());
return circulationMapper.updateById(schoolCirculation); return circulationMapper.updateById(schoolCirculation);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java
...@@ -9,17 +9,12 @@ import com.ruoyi.common.exception.base.BaseException; ...@@ -9,17 +9,12 @@ import com.ruoyi.common.exception.base.BaseException;
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;
import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEncode; import yangtz.cs.liu.campus.domain.schoolEquipment.*;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger; import yangtz.cs.liu.campus.mapper.schoolEquipment.*;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolInStock;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolOutStock;
import yangtz.cs.liu.campus.mapper.schoolEquipment.EncodeMapper;
import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentLedgerMapper;
import yangtz.cs.liu.campus.mapper.schoolEquipment.InStockMapper;
import yangtz.cs.liu.campus.mapper.schoolEquipment.OutStockMapper;
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;
...@@ -38,6 +33,10 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -38,6 +33,10 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
private InStockMapper inStockMapper; private InStockMapper inStockMapper;
@Autowired @Autowired
private OutStockMapper outStockMapper; private OutStockMapper outStockMapper;
@Autowired
private ProductCategoryMapper productCategoryMapper;
@Autowired
private SysUserMapper sysUserMapper;
/** /**
* 查看设备台账列表 * 查看设备台账列表
...@@ -105,9 +104,15 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -105,9 +104,15 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
@Override @Override
@Transactional @Transactional
public int insertSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger) { public int insertSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger) {
if (StringUtils.isNotNull(schoolEquipmentLedger.getUseId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
schoolEquipmentLedger.setUseName(userName);
}
//生成自编码 //生成自编码
String code = getCode(schoolEquipmentLedger.getClassificationCode()); String code = getCode(schoolEquipmentLedger.getClassificationCode());
schoolEquipmentLedger.setEncode(code); schoolEquipmentLedger.setEncode(code);
schoolEquipmentLedger.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolEquipmentLedger.setCreateTime(DateUtils.getNowDate());
int i = equipmentLedgerMapper.insert(schoolEquipmentLedger); int i = equipmentLedgerMapper.insert(schoolEquipmentLedger);
//新增入库信息 //新增入库信息
SchoolInStock schoolInStock = new SchoolInStock(); SchoolInStock schoolInStock = new SchoolInStock();
...@@ -126,6 +131,12 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -126,6 +131,12 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
@Override @Override
@Transactional @Transactional
public int updateSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger) { public int updateSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger) {
if (StringUtils.isNotNull(schoolEquipmentLedger.getUseId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
schoolEquipmentLedger.setUseName(userName);
}
schoolEquipmentLedger.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolEquipmentLedger.setUpdateTime(DateUtils.getNowDate());
return equipmentLedgerMapper.updateById(schoolEquipmentLedger); return equipmentLedgerMapper.updateById(schoolEquipmentLedger);
} }
...@@ -190,12 +201,21 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe ...@@ -190,12 +201,21 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、规格为空，请你重新输入！"); failureMsg.append("<br/>" + failureNum + "、规格为空，请你重新输入！");
}else if (StringUtils.isNull(schoolEquipmentLedger.getClassificationCode())){ }else if (StringUtils.isNull(schoolEquipmentLedger.getClassificationCode())){
if(schoolEquipmentLedger.getClassificationCode().length() < 4){ failureNum++;
failureMsg.append("<br/>" + failureNum + "、分类编码为空，请你重新输入！");
}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++; failureNum++;
failureMsg.append("<br/>" + 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 + "、单位为空，请你重新输入！");
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java
...@@ -5,6 +5,8 @@ import com.ruoyi.common.annotation.DataScope; ...@@ -5,6 +5,8 @@ import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
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.system.mapper.SysUserMapper;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -23,6 +25,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -23,6 +25,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
@Autowired @Autowired
private EquipmentRepairMapper equipmentRepairMapper; private EquipmentRepairMapper equipmentRepairMapper;
@Autowired
private SysUserMapper sysUserMapper;
/** /**
* 查看设备报修列表 * 查看设备报修列表
...@@ -52,7 +56,16 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -52,7 +56,16 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
@Override @Override
@Transactional @Transactional
public int insertSchoolEquipmentRepairVo(SchoolEquipmentRepair schoolEquipmentRepair) { public int insertSchoolEquipmentRepairVo(SchoolEquipmentRepair schoolEquipmentRepair) {
schoolEquipmentRepair.setReportRepairTime(DateUtils.getNowDate()); if (StringUtils.isNotNull(schoolEquipmentRepair.getReportRepairId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentRepair.getReportRepairId()).getUserName();
schoolEquipmentRepair.setReportRepair(userName);
}
if (StringUtils.isNotNull(schoolEquipmentRepair.getRepairId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentRepair.getRepairId()).getUserName();
schoolEquipmentRepair.setRepairName(userName);
}
schoolEquipmentRepair.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolEquipmentRepair.setCreateTime(DateUtils.getNowDate());
return equipmentRepairMapper.insert(schoolEquipmentRepair); return equipmentRepairMapper.insert(schoolEquipmentRepair);
} }
...@@ -64,6 +77,16 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -64,6 +77,16 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
@Override @Override
@Transactional @Transactional
public int updateSchoolEquipmentRepair(SchoolEquipmentRepair schoolEquipmentRepair) { public int updateSchoolEquipmentRepair(SchoolEquipmentRepair schoolEquipmentRepair) {
if (StringUtils.isNotNull(schoolEquipmentRepair.getReportRepairId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentRepair.getReportRepairId()).getUserName();
schoolEquipmentRepair.setReportRepair(userName);
}
if (StringUtils.isNotNull(schoolEquipmentRepair.getRepairId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentRepair.getRepairId()).getUserName();
schoolEquipmentRepair.setRepairName(userName);
}
schoolEquipmentRepair.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolEquipmentRepair.setUpdateTime(DateUtils.getNowDate());
return equipmentRepairMapper.updateById(schoolEquipmentRepair); return equipmentRepairMapper.updateById(schoolEquipmentRepair);
} }
...@@ -85,8 +108,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -85,8 +108,8 @@ 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,userId); return equipmentRepairMapper.getEquipment(encode);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ProductCategoryServiceImpl.java
...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment; ...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
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.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserMapper;
...@@ -54,6 +55,14 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe ...@@ -54,6 +55,14 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
@Override @Override
@Transactional @Transactional
public int insertSchoolProductCategory(SchoolProductCategory schoolProductCategory) { public int insertSchoolProductCategory(SchoolProductCategory schoolProductCategory) {
//查询分类编码是否重复
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolProductCategory::getClassificationCode,schoolProductCategory.getClassificationCode())
.eq(SchoolProductCategory::getDelFlag,"0");
List<SchoolProductCategory> schoolProductCategories = productCategoryMapper.selectList(wrapper);
if (schoolProductCategories != null && schoolProductCategories.size() > 0){
throw new ServiceException("该分类编码已存在");
}
//父id //父id
Long parentId = schoolProductCategory.getParentId(); Long parentId = schoolProductCategory.getParentId();
if (null != parentId){ if (null != parentId){
...@@ -67,6 +76,8 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe ...@@ -67,6 +76,8 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
schoolProductCategory.setRank((long) split.length); schoolProductCategory.setRank((long) split.length);
String userName = sysUserMapper.selectUserById(schoolProductCategory.getAdminId()).getUserName(); String userName = sysUserMapper.selectUserById(schoolProductCategory.getAdminId()).getUserName();
schoolProductCategory.setAdmin(userName); schoolProductCategory.setAdmin(userName);
schoolProductCategory.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolProductCategory.setCreateTime(DateUtils.getNowDate());
return productCategoryMapper.insert(schoolProductCategory); return productCategoryMapper.insert(schoolProductCategory);
} }
...@@ -78,6 +89,11 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe ...@@ -78,6 +89,11 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
@Override @Override
@Transactional @Transactional
public int updateSchoolProductCategory(SchoolProductCategory schoolProductCategory) { public int updateSchoolProductCategory(SchoolProductCategory schoolProductCategory) {
//根据用户id获取用户名
String userName = sysUserMapper.selectUserById(schoolProductCategory.getAdminId()).getUserName();
schoolProductCategory.setAdmin(userName);
schoolProductCategory.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolProductCategory.setUpdateTime(DateUtils.getNowDate());
return productCategoryMapper.updateById(schoolProductCategory); return productCategoryMapper.updateById(schoolProductCategory);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ReceiveServiceImpl.java
...@@ -2,7 +2,10 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment; ...@@ -2,7 +2,10 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
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.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive; import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
...@@ -17,6 +20,8 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive ...@@ -17,6 +20,8 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
@Autowired @Autowired
private ReceiveMapper receiveMapper; private ReceiveMapper receiveMapper;
@Autowired
private SysUserMapper sysUserMapper;
/** /**
* 查看设备领用列表 * 查看设备领用列表
...@@ -46,6 +51,16 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive ...@@ -46,6 +51,16 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
*/ */
@Override @Override
public int insertSchoolReceive(SchoolReceive schoolReceive) { public int insertSchoolReceive(SchoolReceive schoolReceive) {
if (StringUtils.isNotNull(schoolReceive.getRecipientById())){
String userName = sysUserMapper.selectUserById(schoolReceive.getRecipientById()).getUserName();
schoolReceive.setRecipientBy(userName);
}
if (StringUtils.isNotNull(schoolReceive.getReceivedById())){
String userName = sysUserMapper.selectUserById(schoolReceive.getReceivedById()).getUserName();
schoolReceive.setReceivedBy(userName);
}
schoolReceive.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolReceive.setCreateTime(DateUtils.getNowDate());
return receiveMapper.insert(schoolReceive); return receiveMapper.insert(schoolReceive);
} }
...@@ -56,6 +71,16 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive ...@@ -56,6 +71,16 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
*/ */
@Override @Override
public int updateSchoolReceive(SchoolReceive schoolReceive) { public int updateSchoolReceive(SchoolReceive schoolReceive) {
if (StringUtils.isNotNull(schoolReceive.getRecipientById())){
String userName = sysUserMapper.selectUserById(schoolReceive.getRecipientById()).getUserName();
schoolReceive.setRecipientBy(userName);
}
if (StringUtils.isNotNull(schoolReceive.getReceivedById())){
String userName = sysUserMapper.selectUserById(schoolReceive.getReceivedById()).getUserName();
schoolReceive.setReceivedBy(userName);
}
schoolReceive.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolReceive.setUpdateTime(DateUtils.getNowDate());
return receiveMapper.updateById(schoolReceive); return receiveMapper.updateById(schoolReceive);
} }
......
smart-campus/src/main/resources/mapper/schoolEquipment/CirculationMapper.xml
...@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE WHERE
c.del_flag = '0' c.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="borrowTime != null and borrowTime != ''">and c.borrow_time = #{borrowTime}</if> <if test="borrowTime != null and borrowTime != ''">and DATE_FORMAT(c.borrow_time,,'%Y-%m-%d') = #{borrowTime}</if>
<if test="borrowById != null and borrowById != ''">and c.borrow_by_id = #{borrowById}</if> <if test="borrowById != null and borrowById != ''">and c.borrow_by_id = #{borrowById}</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
...@@ -85,11 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -85,11 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.received_by, c.received_by,
c.yjuse_time, c.yjuse_time,
c.sjuse_time, c.sjuse_time,
c.remark, c.remark
c.create_by,
c.create_time,
c.update_by,
c.update_time
FROM FROM
school_circulation c school_circulation c
LEFT JOIN school_equipment_ledger el ON c.equipment_id = el.id LEFT JOIN school_equipment_ledger el ON c.equipment_id = el.id
......
smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentRepairMapper.xml
...@@ -110,13 +110,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -110,13 +110,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
school_equipment_ledger school_equipment_ledger
WHERE WHERE
encode = #{encode} encode = #{encode}
AND classification_code IN (
SELECT
classification_code
FROM
school_product_category
WHERE
admin_id = #{adminId})
</select> </select>
<update id="deleteSchoolEquipmentRepairById" parameterType="String"> <update id="deleteSchoolEquipmentRepairById" parameterType="String">
......
smart-campus/src/main/resources/mapper/schoolEquipment/InStockMapper.xml
...@@ -91,11 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -91,11 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
el.place, el.place,
el.use_id, el.use_id,
el.use_name, el.use_name,
i.remark, i.remark
i.create_by,
i.create_time,
i.update_by,
i.update_time
FROM FROM
school_in_stock i school_in_stock i
LEFT JOIN school_equipment_ledger el ON i.equipment_id = el.id LEFT JOIN school_equipment_ledger el ON i.equipment_id = el.id
......
smart-campus/src/main/resources/mapper/schoolEquipment/OutStockMapper.xml
...@@ -91,11 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -91,11 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
el.place, el.place,
el.use_id, el.use_id,
el.use_name, el.use_name,
o.remark, o.remark
o.create_by,
o.create_time,
o.update_by,
o.update_time
FROM FROM
school_out_stock o school_out_stock o
LEFT JOIN school_equipment_ledger el ON o.equipment_id = el.id LEFT JOIN school_equipment_ledger el ON o.equipment_id = el.id
......
smart-campus/src/main/resources/mapper/schoolEquipment/ProductCategoryMapper.xml
...@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSchoolProductCateGoryById" parameterType="Long" resultMap="schoolProductCategoryVoResult"> <select id="selectSchoolProductCateGoryById" parameterType="Long" resultMap="schoolProductCategoryVoResult">
select pc.id,pc.classification_code,pc.parent_id,(select equipment_type from school_product_category where id = pc.parent_id) as parent_name, select pc.id,pc.classification_code,pc.parent_id,(select equipment_type from school_product_category where id = pc.parent_id) as parent_name,
pc.ancestors,pc.equipment_type,pc.model,pc.rank,pc.order_num,pc.admin_id,pc.admin,pc.create_by,pc.create_time,pc.update_by,pc.update_time pc.ancestors,pc.equipment_type,pc.model,pc.rank,pc.order_num,pc.admin_id,pc.admin
from school_product_category pc where id = #{id} from school_product_category pc where id = #{id}
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolEquipment/ReceiveMapper.xml
...@@ -77,11 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -77,11 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.received_by, r.received_by,
r.yjuse_time, r.yjuse_time,
r.sjuse_time, r.sjuse_time,
r.remark, r.remark
r.create_by,
r.create_time,
r.update_by,
r.update_time
FROM FROM
school_receive r school_receive r
LEFT JOIN school_equipment_ledger el ON r.equipment_id = el.id LEFT JOIN school_equipment_ledger el ON r.equipment_id = el.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