Skip to content

D
dd_school
Commit 2924fb84 by baochunxin
Options

#G:物品新增字段优化提交

parent 69e2973e
Showing with 85 additions and 9 deletions
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/MpLoginUser.java
package com.ruoyi.common.core.domain.model; package com.ruoyi.common.core.domain.model;
import java.util.Set;
import lombok.Data; import lombok.Data;
/** /**
...@@ -114,4 +115,9 @@ public class MpLoginUser { ...@@ -114,4 +115,9 @@ public class MpLoginUser {
头像 头像
*/ */
private String avatar; private String avatar;
/**
* 角色权限
*/
private Set<String> roles;
} }
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 java.util.Date; import java.util.Date;
import com.core.domain.OurBaseEntity; import com.core.domain.OurBaseEntity;
...@@ -58,4 +59,7 @@ public class SchoolCirculation extends OurBaseEntity ...@@ -58,4 +59,7 @@ public class SchoolCirculation extends OurBaseEntity
/** 备注 */ /** 备注 */
private String remark; private String remark;
/** 借出状态(0=未归还，1=已归还)" */
private String returnState;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/CirculationMapper.java
...@@ -30,7 +30,8 @@ public interface CirculationMapper extends BaseMapper<SchoolCirculation> { ...@@ -30,7 +30,8 @@ public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
* @return * @return
*/ */
int deleteSchoolCirculationByIds(Long[] ids); int deleteSchoolCirculationByIds(Long[] ids);
@Select("SELECT sc.id,el.model,el.encode,sc.borrow_by,sc.borrow_time,return_time,sc.deadline,sc.return_equipment_condition ,sc.remark FROM school_circulation sc LEFT JOIN school_equipment_ledger el on el.id = sc.equipment_id\n"
@Select("SELECT sc.id,el.model,el.encode,sc.borrow_by,sc.borrow_time,sc.return_state,sc.return_time,sc.deadline,sc.return_equipment_condition ,sc.remark FROM school_circulation sc LEFT JOIN school_equipment_ledger el on el.id = sc.equipment_id\n"
+ " LEFT JOIN school_product_category pc on pc.classification_code = el.classification_code WHERE pc.admin_id=#{adminId}") + " LEFT JOIN school_product_category pc on pc.classification_code = el.classification_code WHERE pc.admin_id=#{adminId}")
List<SchoolCirculationVo> getReturningEquipmentByadminId(@Param("adminId") Long adminId); List<SchoolCirculationVo> getReturningEquipmentByadminId(@Param("adminId") Long adminId);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentRepairMapper.java
...@@ -28,6 +28,12 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> ...@@ -28,6 +28,12 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair>
@Select("SELECT er.id,er.equipment_id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n" @Select("SELECT er.id,er.equipment_id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n"
+ "el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,\n" + "el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,\n"
+ "er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark\n" + "er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark\n"
+ "FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id ")
public List<SchoolEquipmentRepairVo> getlist();
@Select("SELECT er.id,er.equipment_id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n"
+ "el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,\n"
+ "er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark\n"
+ "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")
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(); public List<SchoolEquipmentRepairVo> getMaintenanceUserList();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java
...@@ -108,6 +108,15 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe ...@@ -108,6 +108,15 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
return equipmentRepairMapper.getMaintenanceList(reportRepairid); return equipmentRepairMapper.getMaintenanceList(reportRepairid);
} }
/**
* 管理员获取所有维修列表
* @return
*/
@Override
public List<SchoolEquipmentRepairVo> getlist() {
return equipmentRepairMapper.getlist();
}
@Override @Override
public List<SchoolEquipmentRepairVo> getMaintenanceUserList() { public List<SchoolEquipmentRepairVo> getMaintenanceUserList() {
return equipmentRepairMapper.getMaintenanceUserList(); return equipmentRepairMapper.getMaintenanceUserList();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentRepairService.java
...@@ -60,6 +60,8 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> ...@@ -60,6 +60,8 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair>
public List<SchoolEquipmentRepairVo> getMaintenanceList(Long reportRepairid); public List<SchoolEquipmentRepairVo> getMaintenanceList(Long reportRepairid);
public List<SchoolEquipmentRepairVo> getlist();
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(); public List<SchoolEquipmentRepairVo> getMaintenanceUserList();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolCirculationVo.java
...@@ -87,4 +87,9 @@ public class SchoolCirculationVo extends BaseEntity ...@@ -87,4 +87,9 @@ public class SchoolCirculationVo extends BaseEntity
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
/** 借出状态(0=未归还，1=已归还)" */
@Excel(name = "借出状态")
private String returnState;
} }
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/api/WxLoginController.java
...@@ -17,7 +17,9 @@ import com.ruoyi.framework.util.UserInfoUtil; ...@@ -17,7 +17,9 @@ import com.ruoyi.framework.util.UserInfoUtil;
import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.web.service.MpTokenService; import com.ruoyi.framework.web.service.MpTokenService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import java.util.Set;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -70,6 +72,8 @@ public class WxLoginController extends BaseController { ...@@ -70,6 +72,8 @@ public class WxLoginController extends BaseController {
@Value("${server.port}") @Value("${server.port}")
private String port; private String port;
@Autowired
private SysPermissionService permissionService;
private Logger log = LoggerFactory.getLogger(WxLoginController.class); private Logger log = LoggerFactory.getLogger(WxLoginController.class);
...@@ -125,6 +129,9 @@ public class WxLoginController extends BaseController { ...@@ -125,6 +129,9 @@ public class WxLoginController extends BaseController {
} }
mpLoginUser.setAvatar(user.getAvatar()); mpLoginUser.setAvatar(user.getAvatar());
} }
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
mpLoginUser.setRoles(roles);
return AjaxResult.success().put("userInfo",mpLoginUser); return AjaxResult.success().put("userInfo",mpLoginUser);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/equipment/EquipmentLeaseController.java
...@@ -2,12 +2,16 @@ package yangtz.cs.liu.wechat.controller.equipment; ...@@ -2,12 +2,16 @@ package yangtz.cs.liu.wechat.controller.equipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.service.ISysUserService;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -47,6 +51,8 @@ public class EquipmentLeaseController { ...@@ -47,6 +51,8 @@ public class EquipmentLeaseController {
@Autowired @Autowired
SchoolReceiveService schoolReceiveService; SchoolReceiveService schoolReceiveService;
@Autowired
ISysUserService iSysUserService;
/** /**
* 扫码借用获取设备基本信息 * 扫码借用获取设备基本信息
*/ */
...@@ -62,11 +68,12 @@ public class EquipmentLeaseController { ...@@ -62,11 +68,12 @@ public class EquipmentLeaseController {
* 我的借用记录 * 我的借用记录
*/ */
@GetMapping("/getMyBorrowList/{borrowById}") @GetMapping("/getMyBorrowList/{borrowById}")
private AjaxResult getMyBorrowList(@PathVariable("borrowById") Integer borrowById){ private AjaxResult getMyBorrowList(@PathVariable("borrowById") Long borrowById){
LambdaQueryWrapper<SchoolCirculation> wrapper = new LambdaQueryWrapper<>(); SchoolCirculationVo schoolCirculationVo = new SchoolCirculationVo();
wrapper.eq(SchoolCirculation::getBorrowById,borrowById); schoolCirculationVo.setBorrowById(borrowById);
List<SchoolCirculation> list = iCirculationService.list(wrapper); List<SchoolCirculationVo> schoolCirculationVos = iCirculationService
return AjaxResult.success(list); .selectSchoolCirculationVoList(schoolCirculationVo);
return AjaxResult.success(schoolCirculationVos);
} }
/** /**
...@@ -80,6 +87,7 @@ public class EquipmentLeaseController { ...@@ -80,6 +87,7 @@ public class EquipmentLeaseController {
calendar.setTime(borrowTime); calendar.setTime(borrowTime);
calendar.add(Calendar.DATE,Integer.valueOf(deadline.toString())); calendar.add(Calendar.DATE,Integer.valueOf(deadline.toString()));
Date targetDate = calendar.getTime(); Date targetDate = calendar.getTime();
schoolCirculation.setReturnState("0");
schoolCirculation.setReturnTime(targetDate); schoolCirculation.setReturnTime(targetDate);
boolean save = iCirculationService.save(schoolCirculation); boolean save = iCirculationService.save(schoolCirculation);
//修改设备表借出状态 //修改设备表借出状态
...@@ -132,9 +140,24 @@ public class EquipmentLeaseController { ...@@ -132,9 +140,24 @@ public class EquipmentLeaseController {
*/ */
@GetMapping("/getMaintenanceList/{reportRepairid}") @GetMapping("/getMaintenanceList/{reportRepairid}")
private AjaxResult getMaintenanceList(@PathVariable("reportRepairid") Long reportRepairid){ private AjaxResult getMaintenanceList(@PathVariable("reportRepairid") Long reportRepairid){
List<SchoolEquipmentRepairVo> maintenanceList = iEquipmentRepairService Boolean flag= false;
.getMaintenanceList(reportRepairid); //1.管理员可以查看所有维修列表
return AjaxResult.success(maintenanceList); SysUser sysUser = iSysUserService.selectUserById(reportRepairid);
List<SysRole> roles = sysUser.getRoles();
for(SysRole data :roles){
if (data.getRoleKey().contains("admin") || data.getRoleKey().contains("productCategoryAdmin")){
flag=true;
break;
}
};
if (false){
List<SchoolEquipmentRepairVo> getlist = iEquipmentRepairService.getlist();
return AjaxResult.success(getlist);
}else {
List<SchoolEquipmentRepairVo> maintenanceList = iEquipmentRepairService
.getMaintenanceList(reportRepairid);
return AjaxResult.success(maintenanceList);
}
} }
/** /**
...@@ -162,6 +185,15 @@ public class EquipmentLeaseController { ...@@ -162,6 +185,15 @@ public class EquipmentLeaseController {
boolean save = iEquipmentRepairService.updateById(schoolEquipmentRepair); boolean save = iEquipmentRepairService.updateById(schoolEquipmentRepair);
return AjaxResult.success(save); return AjaxResult.success(save);
} }
/**
* 设备报修删除
*/
@DeleteMapping("/deletEuipemnt/{id}")
private AjaxResult deletEuipemnt(@PathVariable("id") Long id){
boolean b = iEquipmentRepairService.removeById(id);
return AjaxResult.success(b);
}
/** /**
* 报修台账反馈列表 设备维修记录id * 报修台账反馈列表 设备维修记录id
*/ */
...@@ -224,6 +256,7 @@ public class EquipmentLeaseController { ...@@ -224,6 +256,7 @@ public class EquipmentLeaseController {
*/ */
@PutMapping("returnDevice") @PutMapping("returnDevice")
private AjaxResult returnDevice(@RequestBody SchoolCirculation schoolCirculation){ private AjaxResult returnDevice(@RequestBody SchoolCirculation schoolCirculation){
schoolCirculation.setReturnState("1");
boolean b = iCirculationService.updateById(schoolCirculation); boolean b = iCirculationService.updateById(schoolCirculation);
//修改设备表借出状态 //修改设备表借出状态
SchoolEquipmentLedger byId = iEquipmentService.getById(schoolCirculation.getEquipmentId()); SchoolEquipmentLedger byId = iEquipmentService.getById(schoolCirculation.getEquipmentId());
......
smart-campus/src/main/resources/mapper/schoolEquipment/CirculationMapper.xml
...@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="delFalg" column="del_flag" /> <result property="delFalg" column="del_flag" />
<result property="returnState" column="return_state" />
</resultMap> </resultMap>
<select id="selectSchoolCirculationVoList" parameterType="SchoolCirculationVo" resultMap="schoolCirculationVoResult"> <select id="selectSchoolCirculationVoList" parameterType="SchoolCirculationVo" resultMap="schoolCirculationVoResult">
...@@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
el.encode, el.encode,
el.equipment_name, el.equipment_name,
el.model, el.model,
c.return_state,
c.borrow_time, c.borrow_time,
c.borrow_by_id, c.borrow_by_id,
c.borrow_by, c.borrow_by,
...@@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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 c.borrow_time = #{borrowTime}</if>
<if test="borrowById != null and borrowById != ''">and c.borrow_by_id = #{borrowById}</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</select> </select>
......
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