Skip to content

D
dd_school
Commit 022470b2 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:xhxy/smart_school

parents 2afe27cd b3e48586
Showing with 128 additions and 47 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/CirculationMapper.java
......@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
@Mapper
public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
......@@ -31,9 +32,8 @@ public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
*/
int deleteSchoolCirculationByIds(Long[] ids);
@Select("SELECT sc.id,sc.equipment_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} and sc.del_flag=0")
List<SchoolCirculationVo> getReturningEquipmentByadminId(@Param("adminId") Long adminId);
List<SchoolCirculationVo> getReturningEquipmentByadminId(SchoolReceiveQuery schoolReceiveQuery);
@Select(" SELECT el.encode,sc.equipment_id,el.equipment_name,el.model,sc.borrow_time ,sc.borrow_by, sc.purpose,sc.deadline ,\n"
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentRepairMapper.java
......@@ -10,6 +10,7 @@ import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
import java.util.List;
import java.util.Map;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> {
......@@ -19,23 +20,17 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair>
+ "FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id WHERE er.id=#{id} and er.del_flag=0")
public SchoolEquipmentRepairVo getEquipmentById(@Param("id") Long id);
@Select("SELECT er.id,er.equipment_id,el.encode,er.dispose_state,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 WHERE er.report_repair_id=#{reportRepairid} and er.del_flag=0")
public List<SchoolEquipmentRepairVo> getMaintenanceList(@Param("reportRepairid") Long reportRepairid);
public List<SchoolEquipmentRepairVo> getMaintenanceList(SchoolReceiveQuery schoolReceiveQuery);
@Select("SELECT er.id,er.equipment_id,el.encode,er.dispose_state,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 and er.del_flag=0 ")
+ "FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id where er.del_flag=0 ")
public List<SchoolEquipmentRepairVo> getlist();
@Select("SELECT er.id,er.equipment_id,el.encode,er.dispose_state,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 and er.del_flag=0")
public List<SchoolEquipmentRepairVo> getMaintenanceUserList();
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery);
/**
* 查看设备报修列表
......@@ -58,6 +53,9 @@ public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair>
*/
Map<String, String> getEquipment(@Param("encode") String encode);
List<SchoolEquipmentRepairVo> getAdminList(SchoolReceiveQuery schoolReceiveQuery);
/**
* 删除设备报修
* @param ids
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java
......@@ -15,6 +15,7 @@ import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
import java.util.List;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
@Service
public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, SchoolCirculation> implements ICirculationService {
......@@ -26,8 +27,8 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
private SysUserMapper sysUserMapper;
@Override
public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
return circulationMapper.getReturningEquipmentByadminId(userId);
public List<SchoolCirculationVo> getReturningEquipmentByadminId(SchoolReceiveQuery schoolReceiveQuery) {
return circulationMapper.getReturningEquipmentByadminId(schoolReceiveQuery);
}
@Override
......@@ -51,7 +52,11 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
public List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
}
public List<SchoolCirculationVo> selectVxSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo) {
public List<SchoolCirculationVo> selectVxSchoolCirculationVoList(
SchoolReceiveQuery schoolReceiveQuery) {
SchoolCirculationVo schoolCirculationVo = new SchoolCirculationVo();
schoolCirculationVo.setBorrowById(schoolReceiveQuery.getBorrowById());
schoolCirculationVo.setEquipmentName(schoolReceiveQuery.getEquipmentName());
return circulationMapper.selectSchoolCirculationVoList(schoolCirculationVo);
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java
......@@ -18,6 +18,7 @@ import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
import java.util.List;
import java.util.Map;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
@Service
public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMapper, SchoolEquipmentRepair> implements IEquipmentRepairService {
......@@ -49,7 +50,17 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
return equipmentRepairMapper.selectSchoolEquipmentRepairVoById(id);
}
/**
/**
* 管理员查询维修页面，只看管理员自己分类的
* @param reportRepairid
* @return
*/
@Override
public List<SchoolEquipmentRepairVo> getAdminList(SchoolReceiveQuery schoolReceiveQuery) {
return equipmentRepairMapper.getAdminList(schoolReceiveQuery);
}
/**
* 新增设备报修
* @return
*/
......@@ -127,8 +138,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
}
@Override
public List<SchoolEquipmentRepairVo> getMaintenanceList(Long reportRepairid) {
return equipmentRepairMapper.getMaintenanceList(reportRepairid);
public List<SchoolEquipmentRepairVo> getMaintenanceList(SchoolReceiveQuery schoolReceiveQuery) {
return equipmentRepairMapper.getMaintenanceList(schoolReceiveQuery);
}
/**
......@@ -141,8 +152,8 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
}
@Override
public List<SchoolEquipmentRepairVo> getMaintenanceUserList() {
return equipmentRepairMapper.getMaintenanceUserList();
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery) {
return equipmentRepairMapper.getMaintenanceUserList(schoolReceiveQuery);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/ICirculationService.java
......@@ -6,10 +6,11 @@ import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
import java.util.List;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
public interface ICirculationService extends IService<SchoolCirculation> {
List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId);
List<SchoolCirculationVo> getReturningEquipmentByadminId(SchoolReceiveQuery schoolReceiveQuery);
SchoolCirculationVo getSchoolCirculationVoById(Long id);
......@@ -20,7 +21,7 @@ public interface ICirculationService extends IService<SchoolCirculation> {
* @return
*/
List<SchoolCirculationVo> selectSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo);
List<SchoolCirculationVo> selectVxSchoolCirculationVoList(SchoolCirculationVo schoolCirculationVo);
List<SchoolCirculationVo> selectVxSchoolCirculationVoList(SchoolReceiveQuery schoolCirculationVo);
/**
* 查看设备借出归还详细信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentRepairService.java
......@@ -7,6 +7,7 @@ import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
import java.util.List;
import java.util.Map;
import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveQuery;
public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> {
/**
......@@ -22,6 +23,8 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair>
* @return
*/
SchoolEquipmentRepairVo selectSchoolEquipmentRepairVoById(Long id);
List<SchoolEquipmentRepairVo> getAdminList(SchoolReceiveQuery schoolReceiveQuery);
/**
* 新增设备报修
......@@ -58,12 +61,12 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair>
public SchoolEquipmentRepairVo getEquipmentById(Long id);
public List<SchoolEquipmentRepairVo> getMaintenanceList(Long reportRepairid);
public List<SchoolEquipmentRepairVo> getMaintenanceList(SchoolReceiveQuery schoolReceiveQuery);
public List<SchoolEquipmentRepairVo> getlist();
public List<SchoolEquipmentRepairVo> getMaintenanceUserList();
public List<SchoolEquipmentRepairVo> getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolReceiveQuery.java
......@@ -2,9 +2,8 @@ package yangtz.cs.liu.campus.vo.schoolEquipment;
import javax.validation.constraints.NotNull;
import lombok.Data;
/**
* 领用查询
* 领用、租借，维修查询
*/
@Data
public class SchoolReceiveQuery {
......@@ -12,12 +11,26 @@ public class SchoolReceiveQuery {
/**
* 领用人
*/
@NotNull(message = "领用人不能为空")
private String recipientById;
/**
* 借用人
*/
private Long borrowById;
/**
* 报修人
*/
private Long reportRepairid;
/**
* 设备名称
*/
private String equipmentName;
/**
* 管理员查询id
*/
private Long userId;
}
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/equipment/EquipmentLeaseController.java
......@@ -70,12 +70,10 @@ public class EquipmentLeaseController {
/**
* 我的借用记录
*/
@GetMapping("/getMyBorrowList/{borrowById}")
private AjaxResult getMyBorrowList(@PathVariable("borrowById") Long borrowById){
SchoolCirculationVo schoolCirculationVo = new SchoolCirculationVo();
schoolCirculationVo.setBorrowById(borrowById);
@GetMapping("/getMyBorrowList")
private AjaxResult getMyBorrowList(SchoolReceiveQuery schoolReceiveQuery){
List<SchoolCirculationVo> schoolCirculationVos = iCirculationService
.selectVxSchoolCirculationVoList(schoolCirculationVo);
.selectVxSchoolCirculationVoList(schoolReceiveQuery);
return AjaxResult.success(schoolCirculationVos);
}
......@@ -113,8 +111,7 @@ public class EquipmentLeaseController {
* 领用台账list
*/
@GetMapping("/getUseList")
private AjaxResult getMyBorrowList(SchoolReceiveQuery schoolReceiveQuery){
private AjaxResult getUseList(SchoolReceiveQuery schoolReceiveQuery){
List<SchoolReceiveVo> recipientByIdlist = schoolReceiveService
.getRecipientByIdlist(schoolReceiveQuery);
return AjaxResult.success(recipientByIdlist);
......@@ -149,24 +146,24 @@ public class EquipmentLeaseController {
/**
* 设备维修-列表
*/
@GetMapping("/getMaintenanceList/{reportRepairid}")
private AjaxResult getMaintenanceList(@PathVariable("reportRepairid") Long reportRepairid){
@GetMapping("/getMaintenanceList")
private AjaxResult getMaintenanceList(SchoolReceiveQuery schoolReceiveQuery){
Boolean flag= false;
//1.管理员可以查看所有维修列表
SysUser sysUser = iSysUserService.selectUserById(reportRepairid);
SysUser sysUser = iSysUserService.selectUserById(schoolReceiveQuery.getReportRepairid());
List<SysRole> roles = sysUser.getRoles();
for(SysRole data :roles){
if (data.getRoleKey().contains("admin") || data.getRoleKey().contains("productCategoryAdmin")){
if (data.getRoleKey().contains("productCategoryAdmin")){
flag=true;
break;
}
};
if (false){
List<SchoolEquipmentRepairVo> getlist = iEquipmentRepairService.getlist();
List<SchoolEquipmentRepairVo> getlist = iEquipmentRepairService.getAdminList(schoolReceiveQuery);
return AjaxResult.success(getlist);
}else {
List<SchoolEquipmentRepairVo> maintenanceList = iEquipmentRepairService
.getMaintenanceList(reportRepairid);
.getMaintenanceList(schoolReceiveQuery);
return AjaxResult.success(maintenanceList);
}
}
......@@ -236,20 +233,20 @@ public class EquipmentLeaseController {
* 维修人员报修列表
*/
@GetMapping("getMaintenanceUserList")
private AjaxResult getMaintenanceUserList(){
private AjaxResult getMaintenanceUserList(SchoolReceiveQuery schoolReceiveQuery){
List<SchoolEquipmentRepairVo> maintenanceUserList = iEquipmentRepairService
.getMaintenanceUserList();
.getMaintenanceUserList(schoolReceiveQuery);
return AjaxResult.success(maintenanceUserList);
}
/**
* 管理员列表查询
*/
@GetMapping("/getReturningEquipmentList/{userId}")
private AjaxResult getReturningEquipmentList(@PathVariable("userId") Long userId){
@GetMapping("/getReturningEquipmentList")
private AjaxResult getReturningEquipmentList(SchoolReceiveQuery schoolReceiveQuery){
//根据管理员信息查看所有已借出设备信息
List<SchoolCirculationVo> returningEquipmentByadminId = iCirculationService
.getReturningEquipmentByadminId(userId);
.getReturningEquipmentByadminId(schoolReceiveQuery);
return AjaxResult.success(returningEquipmentByadminId);
}
......
smart-campus/src/main/resources/mapper/schoolEquipment/CirculationMapper.xml
......@@ -93,6 +93,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.id = #{id}
</select>
<select id="getReturningEquipmentByadminId" parameterType="SchoolReceiveQuery" resultMap="schoolCirculationVoResult">
SELECT sc.id,sc.equipment_id,el.equipment_name,el.model,el.encode,sc.borrow_by_id,sc.borrow_by,sc.purpose,el.is_lend,sc.received_by_id,sc.received_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
LEFT JOIN school_product_category pc on pc.classification_code = el.classification_code WHERE pc.admin_id=#{userId} and sc.del_flag=0
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
</select>
<update id="deleteSchoolCirculationByIds" parameterType="String">
update school_circulation set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
......
smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentRepairMapper.xml
......@@ -69,6 +69,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
</select>
<select id="getMaintenanceUserList" parameterType="SchoolReceiveQuery" resultMap="schoolEquipmentRepairVoResult">
SELECT er.id,er.equipment_id,el.encode,er.dispose_state,el.equipment_name,el.model,el.date_of_production,el.place ,
el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,
er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark
FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id
where er.del_flag=0
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
</select>
<select id="getMaintenanceList" parameterType="SchoolReceiveQuery" resultMap="schoolEquipmentRepairVoResult">
SELECT er.id,er.equipment_id,el.encode,er.dispose_state,el.equipment_name,el.model,el.date_of_production,el.place ,
el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,
er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark
FROM school_equipment_repair er LEFT JOIN school_equipment_ledger el ON er.equipment_id=el.id WHERE er.report_repair_id=#{reportRepairid} and er.del_flag=0
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
</select>
<select id="selectSchoolEquipmentRepairVoById" parameterType="Long" resultMap="schoolEquipmentRepairVoResult">
SELECT
er.id,
......@@ -97,6 +122,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where er.id = #{id}
</select>
<select id="getAdminList" parameterType="SchoolReceiveQuery" resultMap="schoolEquipmentRepairVoResult">
SELECT er.id,er.equipment_id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place,el.classification_code,
er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,er.repair_id,er.repair_name,er.repair_phone,
er.repair_time,er.repair_state,er.dispose_state,er.evaluate,er.remark FROM school_equipment_repair er LEFT JOIN
school_equipment_ledger el on er.equipment_id = el.id LEFT JOIN school_product_category pc
on pc.classification_code = el.classification_code WHERE pc.admin_id=#{reportRepairid} AND er.del_flag=0
<if test="equipmentName != null and equipmentName != ''">and el.equipment_name like concat('%', #{equipmentName}, '%')</if>
</select>
<select id="getEquipment" resultType="Map">
SELECT
id AS equipmentId,
......@@ -112,6 +148,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
encode = #{encode}
</select>
<update id="deleteSchoolEquipmentRepairById" parameterType="String">
update school_equipment_repair set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
......
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