art: 技术状态鉴定工单-数据库设计修改

zhangherong

2025-07-10 16cd6a3d63f3352c1a20abb5fc73f48a4204bc62

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java

@@ -140,10 +140,10 @@
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法添加借用记录！");
        }
        if (equipment.getOrgId().equals(request.getNewDepartId())) {
            throw new JeecgBootException("当前设备属于此车间，不需要变动！");
        }
        request.setOldDepartId(equipment.getOrgId());
//        if (equipment.getOrgId().equals(request.getNewDepartId())) {
//            throw new JeecgBootException("当前设备属于此车间，不需要变动！");
//        }
//        request.setOldDepartId(equipment.getOrgId());
        request.setReportUser(sysUser.getUsername());
        return equipmentTransferMapper.insert(request) > 0;
    }
@@ -185,7 +185,7 @@
        variables.put("comment", entity.getTransferReason());
        variables.put("proofreading", true);
        // 分配给设备管理员
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(),null, BusinessCodeConst.PCR0004);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给设备管理员，无法进入下级审批！");
        }
@@ -305,7 +305,7 @@
        updateWrapper.set("equipment_id", request.getEquipmentId());
        updateWrapper.set("remark", request.getRemark());
        updateWrapper.set("transfer_reason", request.getTransferReason());
        updateWrapper.set("old_depart_id", equipment.getOrgId());
//        updateWrapper.set("old_depart_id", equipment.getOrgId());
        updateWrapper.set("new_depart_id", request.getNewDepartId());
        updateWrapper.eq("id", request.getId());
        updateWrapper.eq("report_user", sysUser.getUsername());