| | |
| | | public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) { |
| | | if (gdWorkOrder.getIsQueryAll()) { |
| | | List<Long> deptList = new ArrayList<>(); |
| | | if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) { |
| | | if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) { |
| | | deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); |
| | | } |
| | | gdWorkOrder.setDeptList(deptList); |
| | |
| | | if (centerCoords == null || centerCoords.length < 2) { |
| | | return false; |
| | | } |
| | | String countyCode = GdGeoAddressUtil.getCountyCode(centerCoords[0], centerCoords[1]); |
| | | String countyCode = GdGeoAddressUtil.getTownCode(centerCoords[0], centerCoords[1]); |
| | | entity.setAreaCode(countyCode); |
| | | // 生成工单编号 |
| | | if (StringUtils.isBlank(entity.getWorkOrderCode())) { |
| | |
| | | boolean updateResult = updateById(workOrder); |
| | | |
| | | // 5. 把待验收的都改为待签收状态 |
| | | // 修复类型不匹配问题:将 String 转为 Integer,因为数据库字段是 smallint 类型 |
| | | if (operationType == 10) { |
| | | return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate() |
| | | .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue()) |
| | | .set(GdPatrolTaskEntity::getTaskStatus, Integer.parseInt(PatrolTaskStatusEnum.PENDING_SIGNING.getValue())) |
| | | .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId()) |
| | | .in(GdPatrolTaskEntity::getTaskStatus, |
| | | PatrolTaskStatusEnum.AUDIT_PASSED.getValue(), |
| | | PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue()) |
| | | Integer.parseInt(PatrolTaskStatusEnum.AUDIT_PASSED.getValue()), |
| | | Integer.parseInt(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())) |
| | | ); |
| | | } |
| | | // 6. 保存流转记录 |