boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-21 21:49:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改了PC页面数据问题

Browse Source
This commit is contained in:
chenze 2024-08-14 19:03:50 +08:00
parent c7265b67d7
commit 38a200d313
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java
View File

@ -74,13 +74,13 @@ public class RepairDeviceTypeController extends BaseController {
IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(relational.getUserId()); IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(relational.getUserId());
workersName.add(staff.getUsername()); workersName.add(staff.getUsername());
staffLists.add(staff); staffLists.add(staff);
} }
} }
deviceType.setWorkerId(workerId); deviceType.setWorkerId(workerId);
deviceType.setStaffLists(staffLists); deviceType.setStaffLists(staffLists);
if (workersName.size()>0){ if (workersName.size()>0){
deviceType.setWorker(workersName.get(0)+"等"+workersName.size()+"人"); deviceType.setWorker(workersName.get(0)+"等"+workersName.size()+"人");
deviceType.setWorkerName(workersName);
} }
//根据用户id查询对应数据 //根据用户id查询对应数据
} }
@ -176,9 +176,17 @@ public class RepairDeviceTypeController extends BaseController {
return toAjax(repairDeviceTypeService.deleteRepairDeviceTypeByIds(ids)); return toAjax(repairDeviceTypeService.deleteRepairDeviceTypeByIds(ids));
} }
/** /**
* 获取普通用户列表（新增为维修人或者派单员） * 获取普通用户列表（新增为维修人或者派单员）
*/ */
@RequiresPermissions("RepairDeviceType:type:view")
@GetMapping("selectUserListByType")
public R selectUserListByType() {
return R.data(customerStaffService.selectUserListByType());
}
/** /**
* 根据设备类型id查询关联的派单员、维修人员 * 根据设备类型id查询关联的派单员、维修人员
*/ */

1
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java
View File

@ -304,7 +304,6 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl<IcsCustomerStaffMap
QueryWrapper<IcsCustomerStaff> wrapper = new QueryWrapper<>(); QueryWrapper<IcsCustomerStaff> wrapper = new QueryWrapper<>();
wrapper.eq("data_type", 1);
return icsCustomerStaffMapper.selectList(wrapper); return icsCustomerStaffMapper.selectList(wrapper);
} }

2
shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml
View File

@ -59,7 +59,7 @@
select url from ics_repair_attach where repair_id=#{repairId} and node_id=1 and delete_flag=0 and ext1='img' order by id limit 1 select url from ics_repair_attach where repair_id=#{repairId} and node_id=1 and delete_flag=0 and ext1='img' order by id limit 1
</select> </select>
<insert id="insertRepairAttach" parameterType="com.ics.admin.domain.RepairAttach"> <insert id="insertRepairAttach" parameterType="com.ics.admin.domain.RepairAttach" useGeneratedKeys="true" keyProperty="id">
INSERT INTO ics_repair_attach INSERT INTO ics_repair_attach
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="repairId != null ">repair_id,</if> <if test="repairId != null ">repair_id,</if>