Commit c02d3c07 by xuwenhao

修改设备报修

parent 87ed926a
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolEquipment;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
......@@ -17,6 +19,7 @@ public class SchoolEquipmentRepair extends OurBaseEntity
{
/** 设备id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 设备id */
......
......@@ -56,7 +56,7 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair>
* @param
* @return
*/
Map<String, String> getEquipment(@Param("encode") String encode,@Param("adminId") Long adminId);
Map<String, String> getEquipment(@Param("encode") String encode);
/**
* 删除设备报修
......
......@@ -12,14 +12,8 @@ import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEncode;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
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.domain.schoolEquipment.*;
import yangtz.cs.liu.campus.mapper.schoolEquipment.*;
import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
......@@ -38,6 +32,8 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
private InStockMapper inStockMapper;
@Autowired
private OutStockMapper outStockMapper;
@Autowired
private ProductCategoryMapper productCategoryMapper;
/**
* 查看设备台账列表
......@@ -190,12 +186,21 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
failureNum++;
failureMsg.append("<br/>" + failureNum + "、规格为空,请你重新输入!");
}else if (StringUtils.isNull(schoolEquipmentLedger.getClassificationCode())){
if(schoolEquipmentLedger.getClassificationCode().length() < 4){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、分类编码长度最少为4位,请你核对后重新输入!");
}
failureNum++;
failureMsg.append("<br/>" + failureNum + "、分类编码为空,请你重新输入!");
}else if(schoolEquipmentLedger.getClassificationCode().length() < 4){
failureNum++;
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())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、单位为空,请你重新输入!");
......
......@@ -85,8 +85,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
*/
@Override
public Map<String, String> getEquipment(String encode) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
return equipmentRepairMapper.getEquipment(encode,userId);
// Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
return equipmentRepairMapper.getEquipment(encode);
}
/**
......
......@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.SysUserMapper;
......@@ -54,6 +55,14 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
@Override
@Transactional
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
Long parentId = schoolProductCategory.getParentId();
if (null != parentId){
......
......@@ -110,13 +110,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
school_equipment_ledger
WHERE
encode = #{encode}
AND classification_code IN (
SELECT
classification_code
FROM
school_product_category
WHERE
admin_id = #{adminId})
</select>
<update id="deleteSchoolEquipmentRepairById" parameterType="String">
......
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